diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 485c5141..75d7f99a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ stages:
   - build_packages
   - release
   - distribute
+  - failed
 
 format:
   stage: test
@@ -403,4 +404,16 @@ nightly_delete_build_machines:
     - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh delete arm64-deb
     - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh delete amd64-rpm
   rules:
-    - if: $IS_NIGHTLY == "true"
\ No newline at end of file
+    - if: $IS_NIGHTLY == "true"
+
+# If any steps fail this will run the build machine tear down scripts
+
+failed_pipeline_actions:
+  stage: failed
+  tags:
+    - build-orchestration
+  script:
+    - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh delete amd64-deb
+    - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh delete arm64-deb
+    - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh delete amd64-rpm
+  when: on_failure
\ No newline at end of file