diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93cde3ed52bb4f49c6b39c246f88cf0942b72135..79a22d795d9732bbb9e0d635b5eaaa08b14d4094 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -181,8 +181,13 @@ extended:
   tags:
   - heat
   - ansible
+  before_script:
+    - echo "cleanup stack"
+    - sleep 30
+    - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
   script:
-  - echo "extended stage"
+    - source ./$NECTAR_ALLOCATION-openrc.sh
+    - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
   only:
     variables:
       - $EXTENDED != null
@@ -198,7 +203,4 @@ clean:
   script:
     - source ./$NECTAR_ALLOCATION-openrc.sh
     - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
-  when: manual 
-  only:
-    variables:
-      - $EXTENDED != null
\ No newline at end of file
+  when: manual
\ No newline at end of file