diff --git a/.buildkite/deployment.sh b/.buildkite/deployment.sh
index f87148503..860bb6bf5 100755
--- a/.buildkite/deployment.sh
+++ b/.buildkite/deployment.sh
@@ -31,6 +31,9 @@ steps:
 
   - label: ":docker: Deploy Manifests"
     command: "authelia-scripts docker push-manifest"
+    retry:
+      manual:
+        permit_on_passed: true
     env:
       DOCKER_CLI_EXPERIMENTAL: "enabled"
     agents:
diff --git a/.buildkite/steps/buildimages.sh b/.buildkite/steps/buildimages.sh
index 00d40ab00..8c543d22b 100755
--- a/.buildkite/steps/buildimages.sh
+++ b/.buildkite/steps/buildimages.sh
@@ -8,6 +8,9 @@ for BUILD_OS in "${!BUILDS[@]}"; do
 cat << EOF
   - label: ":docker: Build Image [${BUILD_ARCH}]"
     command: "authelia-scripts docker build --arch=${BUILD_ARCH}"
+    retry:
+      manual:
+        permit_on_passed: true
     agents:
       build: "${BUILD_OS}-${BUILD_ARCH}"
     artifact_paths: