diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index 7f55e102a7224fdc4816420aa09db032198a4cc8..05807f43e8a0369f19a0b8e4e8d0cdc15f213cb6 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -384,7 +384,7 @@ Debug:
       when: never
     - if: '$DISABLE_DEPLOYMENT_LOCAL != "1"'
       when: never
-    - when: always
+    - when: on_success
   dependencies:
     - 'Build Theme'
 
@@ -405,7 +405,7 @@ Debug:
       when: never
     - if: '$DISABLE_DEPLOYMENT_LOCAL != "1"'
       when: never
-    - when: always
+    - when: on_success
   dependencies:
     - 'Build Prod Site'
     - 'Build Theme'
@@ -464,6 +464,7 @@ Debug:
     - if: '$DISABLE_DEPLOYMENT != "0"'
       when: never
     - if: '$DISABLE_DEPLOYMENT_LOCAL != "1"'
+      when: on_success
   dependencies:
     - 'Build Prod Site'
     - 'Build Prod Site NG'