diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50c0b9e8fe0a60576951ddd6d168f5ae5dff5222..3b8c216fe9fb8ed03dab4367004bf4751223aab8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,9 @@ stages:
 #  - integration_test_downstream # working but unwanted here
 #  - trigger_pipeline_in_B   # working but unwanted here
   - lint
+  - delete_stack_manual
   - extended
+  - heat_test
   - heat
   - ansible_create_cluster_stage
   - push_button_spawn_cluster
@@ -26,7 +28,7 @@ stages:
 #  - "curl --request POST --form token=${CI_JOB_TOKEN} --form ref=master https://gitlab.erc.monash.edu.au/api/v4/projects/1085/trigger/pipeline"  # ID is from pysshauthz
 
 heat_test:
-  stage: heat
+  stage: heat_test
   allow_failure: false
   tags:
   - heat
@@ -63,7 +65,7 @@ yamllint:
     - yamllint -c ./.yamllintheat.yaml ./heat
 
 delete_stack_manual:
-  stage: heat
+  stage: delete_stack_manual
   tags:
   - heat
   before_script: