diff --git a/CICD/heat/heatcicdwrapper.sh b/CICD/heat/heatcicdwrapper.sh
index 97ad8fc6a70f501e48529c650d9c9958a9a9e48a..9f9d9bb1378e1956c2f5d131687ec06b4336716b 100644
--- a/CICD/heat/heatcicdwrapper.sh
+++ b/CICD/heat/heatcicdwrapper.sh
@@ -14,7 +14,15 @@ if [ "$#" -ne 2 ]; then
 fi
 
 STACKNAME=$2
-STACKNAME="CICD"$STACKNAME
+
+
+if [[ "$STACKNAME" == *"$CICD"* ]]; then
+  echo "CICD found in stackname. doing nothing"
+else
+  STACKNAME="CICD"$STACKNAME
+fi
+
+
 
 echo "[heatcicdwrapper] Prefixing Stackname with CICD. This is a safety feature because this script can also delete stacks"