diff --git a/.buildkite/deployment.yml b/.buildkite/deployment.yml
new file mode 100644
index 00000000..bb125610
--- /dev/null
+++ b/.buildkite/deployment.yml
@@ -0,0 +1,20 @@
+steps:
+  - label: ":docker: Image Deployments"
+    command: ".buildkite/steps/deployimages.sh | buildkite-agent pipeline upload"
+    concurrency: 1
+    concurrency_group: "deployments"
+
+  - wait
+
+  - label: ":docker: Deploy Manifests"
+    command: "authelia-scripts docker push-manifest"
+    concurrency: 1
+    concurrency_group: "deployments"
+    env:
+      DOCKER_CLI_EXPERIMENTAL: "enabled"
+
+  - label: ":github: Deploy Artifacts"
+    command: ".buildkite/steps/ghartifacts.sh"
+    agents:
+      upload: "fast"
+    if: build.tag != null
\ No newline at end of file
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 58dd9e49..84f1f3cc 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -15,30 +15,4 @@ steps:
   - label: ":chrome: Integration Tests"
     command: ".buildkite/steps/e2etests.sh | buildkite-agent pipeline upload"
     depends_on:
-      - "build-docker-amd64"
-
-  - wait
-
-  - label: ":docker: Image Deployments"
-    command: ".buildkite/steps/deployimages.sh | buildkite-agent pipeline upload"
-    concurrency: 1
-    concurrency_group: "deployments"
-
-  - wait
-
-  - label: ":docker: Deploy Manifests"
-    command: "authelia-scripts docker push-manifest"
-    concurrency: 1
-    concurrency_group: "deployments"
-    env:
-      DOCKER_CLI_EXPERIMENTAL: "enabled"
-
-  - label: ":github: Deploy Artifacts"
-    command: ".buildkite/steps/ghartifacts.sh"
-    agents:
-      upload: "fast"
-    depends_on:
-      - "build-docker-amd64"
-      - "build-docker-arm32v7"
-      - "build-docker-arm64v8"
-    if: build.tag != null
\ No newline at end of file
+      - "build-docker-amd64"
\ No newline at end of file