diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b8c216fe9fb8ed03dab4367004bf4751223aab8..80719fbf6d41659bdb26d1b52289d58eab172ca3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,9 +8,9 @@ stages:
 #  - integration_test_downstream # working but unwanted here
 #  - trigger_pipeline_in_B   # working but unwanted here
   - lint
-  - delete_stack_manual
+  #- delete_stack_manual
   - extended
-  - heat_test
+  #- heat_test
   - heat
   - ansible_create_cluster_stage
   - push_button_spawn_cluster
@@ -27,31 +27,31 @@ stages:
 #  script:
 #  - "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_test
-  allow_failure: false
-  tags:
-  - heat
-  before_script:
-    - echo "$GC_KEY" > gc_key.pem
-    - chmod 400 gc_key.pem
-    - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
-    - source ./$NECTAR_ALLOCATION-openrc.sh
-    - export HEAT_TEST_STACKNAME=_TESTING_HEAT
-    - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $HEAT_TEST_STACKNAME
-    - sleep 60
-  script:
-    - echo "heat_test stage"
-    - source ./$NECTAR_ALLOCATION-openrc.sh
-    - bash -x ./CICD/heat/heatcicdwrapper.sh create $HEAT_TEST_STACKNAME
-    - openstack stack list
-    - bash -x ./CICD/heat/heatcicdwrapper.sh update $HEAT_TEST_STACKNAME
-    - openstack stack list
-    - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $HEAT_TEST_STACKNAME
-    - openstack stack list
-  after_script:
-    - sleep 20 # artifically wait a bit to make sure it is really dead
-  when: manual
+# heat_test:
+#   stage: heat_test
+#   allow_failure: false
+#   tags:
+#   - heat
+#   before_script:
+#     - echo "$GC_KEY" > gc_key.pem
+#     - chmod 400 gc_key.pem
+#     - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
+#     - source ./$NECTAR_ALLOCATION-openrc.sh
+#     - export HEAT_TEST_STACKNAME=_TESTING_HEAT
+#     - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $HEAT_TEST_STACKNAME
+#     - sleep 60
+#   script:
+#     - echo "heat_test stage"
+#     - source ./$NECTAR_ALLOCATION-openrc.sh
+#     - bash -x ./CICD/heat/heatcicdwrapper.sh create $HEAT_TEST_STACKNAME
+#     - openstack stack list
+#     - bash -x ./CICD/heat/heatcicdwrapper.sh update $HEAT_TEST_STACKNAME
+#     - openstack stack list
+#     - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $HEAT_TEST_STACKNAME
+#     - openstack stack list
+#   after_script:
+#     - sleep 20 # artifically wait a bit to make sure it is really dead
+#   when: manual
 
 yamllint:
   stage: lint
@@ -64,20 +64,20 @@ yamllint:
     # - ansible-lint -c .yamllintconf.yaml -x ANSIBLE0002 master_playbook.yml
     - yamllint -c ./.yamllintheat.yaml ./heat
 
-delete_stack_manual:
-  stage: delete_stack_manual
-  tags:
-  - heat
-  before_script:
-    - echo "$GC_KEY" > gc_key.pem
-    - chmod 400 gc_key.pem
-    - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
-  script:
-    - echo "heat stage"
-    - source ./$NECTAR_ALLOCATION-openrc.sh
-    - openstack stack list
-    - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
-  when: manual
+# delete_stack_manual:
+#   stage: delete_stack_manual
+#   tags:
+#   - heat
+#   before_script:
+#     - echo "$GC_KEY" > gc_key.pem
+#     - chmod 400 gc_key.pem
+#     - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
+#   script:
+#     - echo "heat stage"
+#     - source ./$NECTAR_ALLOCATION-openrc.sh
+#     - openstack stack list
+#     - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
+#   when: manual
 
 ansiblelint:
   allow_failure: true