diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d20659a11f3f6badf8bf0cee9683d765c7a7544c..272ff1062a4ea0925f9612ff763fdbf1c371afce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
-  STACKNAME: _reporef$CI_COMMIT_REF_NAME
+  STACKNAME: CICD_reporef$CI_COMMIT_REF_NAME
   NECTAR_ALLOCATION: HPCCICD
 
 stages:
diff --git a/CICD/ansible_create_cluster_script.sh b/CICD/ansible_create_cluster_script.sh
index 3aa506f2288b9fffdf2533bbf7473e248a1742c4..b062d4f21e71371698683164a1c81a9ef40a39b2 100755
--- a/CICD/ansible_create_cluster_script.sh
+++ b/CICD/ansible_create_cluster_script.sh
@@ -7,9 +7,6 @@ openstack stack list
 
 cd CICD
 
-STACKNAME=CICD$STACKNAME
-
-echo "[ansible_create_cluster_script] Prefixing the Stackname with CICD because heatcicdwrapper does he same"
 python3 ../scripts/make_inventory.py static $STACKNAME | tee ./files/inventory.$STACKNAME && chmod 755 ./files/inventory.$STACKNAME
 grep -qv "I could not find any resouces tagged with project_name:" ./files/inventory.$STACKNAME   #fail if inventory file is empty
 ansible -m ping -i files/inventory.$STACKNAME --key-file ../gc_key.pem all