diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c92d27ae..507fef24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,17 +85,6 @@ package_amd64_deb:
   rules:
     - if: '$CI_COMMIT_TAG =~ /v\d.+/'
   
-delete_amd64_deb_build_machine:
-  stage: build_packages
-  needs:
-    - package_amd64_deb
-  tags:
-    - build-orchestration
-  script:
-    - /home/gitlab-runner/build-machine-ctl.sh delete amd64-deb
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /v\d.+/'
-
 package_arm64_deb:
   stage: build_packages
   needs:
@@ -109,17 +98,6 @@ package_arm64_deb:
   rules:
     - if: '$CI_COMMIT_TAG =~ /v\d.+/'
 
-delete_arm64_deb_build_machine:
-  stage: build_packages
-  needs:
-    - package_arm64_deb
-  tags:
-    - build-orchestration
-  script:
-    - /home/gitlab-runner/build-machine-ctl.sh delete arm64-deb
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /v\d.+/'
-
 package_amd64_rpm:
   stage: build_packages
   needs:
@@ -133,17 +111,6 @@ package_amd64_rpm:
   rules:
     - if: '$CI_COMMIT_TAG =~ /v\d.+/'
 
-delete_amd64_rpm_build_machine:
-  stage: build_packages
-  needs:
-    - package_amd64_rpm
-  tags:
-    - build-orchestration
-  script:
-    - /home/gitlab-runner/build-machine-ctl.sh delete amd64-rpm
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /v\d.+/'
-
 build_repositories:
   stage: distribute
   tags:
@@ -161,5 +128,18 @@ deploy_repos:
     - repo-server
   script: 
     - /home/gitlab-runner/deploy-repo.sh
+  rules:
+    - if: '$CI_COMMIT_TAG =~ /v\d.+/'
+
+delete_build_machines:
+  stage: distribute
+  needs:
+    - deploy_repos
+  tags:
+    - build-orchestration
+  script:
+    - /home/gitlab-runner/build-machine-ctl.sh delete amd64-deb
+    - /home/gitlab-runner/build-machine-ctl.sh delete arm64-deb
+    - /home/gitlab-runner/build-machine-ctl.sh delete amd64-rpm
   rules:
     - if: '$CI_COMMIT_TAG =~ /v\d.+/'
\ No newline at end of file