diff --git a/CICD/heat/heatcicdwrapper.sh b/CICD/heat/heatcicdwrapper.sh
index e6554d664e78d68acbf5bc2ec9160a12541fee00..ff8aa04e3307ebccad82258f487cab01e03e3f7b 100644
--- a/CICD/heat/heatcicdwrapper.sh
+++ b/CICD/heat/heatcicdwrapper.sh
@@ -77,6 +77,8 @@ case "$1" in
                    echo "I cannot update a stack which does not exist"
                    exit -45
             fi
+            openstack stack check --wait $STACKNAME
+            sleep 2
             openstack stack update --wait --template ./heat/gc_HOT.yaml --parameter "project_name=$STACKNAME" -e ./heat/resource_registry.yaml $STACKNAME
             ret=$?
             exit $ret
@@ -84,6 +86,8 @@ case "$1" in
         create_or_update)
             if  check_stack_exists
                then
+               openstack stack check --wait $STACKNAME
+               sleep 2
                openstack stack update --wait --template ./heat/gc_HOT.yaml --parameter "project_name=$STACKNAME" -e ./heat/resource_registry.yaml $STACKNAME
                ret=$?
                exit $ret