diff --git a/.buildkite/annotations/artifacts b/.buildkite/annotations/artifacts
new file mode 100644
index 000000000..dca78ba22
--- /dev/null
+++ b/.buildkite/annotations/artifacts
@@ -0,0 +1,24 @@
+<h4>Artifacts</h4>
+<dl class="flex flex-wrap mxn1">
+  <div class="m1">
+    <dt>amd64</dt>
+    <dd>
+      <a href="artifact://authelia-linux-amd64.tar.gz">authelia-linux-amd64.tar.gz</a><br>
+      <a href="artifact://authelia-linux-amd64.tar.gz.sha256">authelia-linux-amd64.tar.gz.sha256</a>
+    </dd>
+  </div>
+  <div class="m1">
+    <dt>arm32v7</dt>
+    <dd>
+      <a href="artifact://authelia-linux-arm32v7.tar.gz">authelia-linux-arm32v7.tar.gz</a><br>
+      <a href="artifact://authelia-linux-arm32v7.tar.gz.sha256">authelia-linux-arm32v7.tar.gz.sha256</a>
+    </dd>
+  </div>
+  <div class="m1">
+    <dt>arm64v8</dt>
+    <dd>
+      <a href="artifact://authelia-linux-arm64v8.tar.gz">authelia-linux-arm64v8.tar.gz</a><br>
+      <a href="artifact://authelia-linux-arm64v8.tar.gz.sha256">authelia-linux-arm64v8.tar.gz.sha256</a>
+    </dd>
+  </div>
+</dl>
\ No newline at end of file
diff --git a/.buildkite/annotations/documentation b/.buildkite/annotations/documentation
new file mode 100644
index 000000000..e6cb1da4e
--- /dev/null
+++ b/.buildkite/annotations/documentation
@@ -0,0 +1,8 @@
+<h4>Documentation Build</h4>
+<dl class="flex flex-wrap mxn1">
+  <div class="m1">
+    <dd>
+      CI/CD steps have been skipped as this build only affects documentation.
+    </dd>
+  </div>
+</dl>
\ No newline at end of file
diff --git a/.buildkite/hooks/post-command b/.buildkite/hooks/post-command
index 9c9bdd6e7..d485aaefc 100755
--- a/.buildkite/hooks/post-command
+++ b/.buildkite/hooks/post-command
@@ -10,6 +10,10 @@ if [[ $BUILDKITE_LABEL =~ ":selenium:" ]] || [[ $BUILDKITE_LABEL =~ ":docker: Bu
   fi
 fi
 
+if [[ $BUILDKITE_LABEL == ":docker: Image Deployments" ]]; then
+  cat .buildkite/annotations/artifacts | buildkite-agent annotate --style "success" --context "ctx-success"
+fi
+
 if [[ $BUILDKITE_LABEL =~ ":docker: Deploy" ]]; then
   docker logout
 fi
@@ -32,4 +36,4 @@ if [[ $BUILDKITE_LABEL == ":docker: Deploy Manifests" ]] && [[ $BUILDKITE_BRANCH
     echo "Removing tag ${PR_TAG}"
     curl -fsL --retry 3 -o /dev/null -X "DELETE" -H "Authorization: JWT ${authtoken}" https://hub.docker.com/v2/repositories/authelia/authelia/tags/${PR_TAG}/
   done
-fi
+fi
\ No newline at end of file
diff --git a/.buildkite/pipeline.sh b/.buildkite/pipeline.sh
index 9a4e087fb..f57848db5 100755
--- a/.buildkite/pipeline.sh
+++ b/.buildkite/pipeline.sh
@@ -7,6 +7,10 @@ else
   CI_DOCS_BYPASS=$(git diff --name-only `git merge-base --fork-point origin/master` | sed -rn '/^docs\/.*/!{q1}' && echo true || echo false)
 fi
 
+if [[ $CI_DOCS_BYPASS == "true" ]]; then
+  cat .buildkite/annotations/documentation | buildkite-agent annotate --style "info" --context "ctx-info"
+fi
+
 cat << EOF
 env:
   CI_DOCS_BYPASS: ${CI_DOCS_BYPASS}