diff --git a/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-contrail41-sl.yaml b/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-queens-contrail41-sl.yaml
similarity index 93%
rename from tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-contrail41-sl.yaml
rename to tcp_tests/templates/cookied-model-generator/salt_heat-cicd-queens-contrail41-sl.yaml
index 1d0bae8..45c1d14 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-contrail41-sl.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-queens-contrail41-sl.yaml
@@ -1,9 +1,9 @@
 {% from 'cookied-model-generator/underlay.yaml' import HOSTNAME_CFG01 with context %}
 {% from 'cookied-model-generator/underlay.yaml' import DOMAIN_NAME with context %}
 
-{% set LAB_CONFIG_NAME = 'heat-cicd-pike-contrail41-sl' %}
+{% set LAB_CONFIG_NAME = 'heat-cicd-queens-contrail41-sl' %}
 # Name of the context file (without extension, that is fixed .yaml) used to render the Environment model
-{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME','heat-cicd-pike-contrail41-sl') %}
+{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME','heat-cicd-queens-contrail41-sl') %}
 # Path to the context files used to render Cluster and Environment models
 {%- set CLUSTER_CONTEXT_NAME = 'salt-context-cookiecutter-contrail.yaml' %}
 {%- set ENVIRONMENT_CONTEXT_NAMES = ['salt-context-environment.yaml', 'salt-context-cookiecutter-contrail.yaml'] %}
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt.yaml b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt.yaml
deleted file mode 100644
index a51a8a9..0000000
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-{% set HOSTNAME_CFG01='cfg01.heat-cicd-pike-contrail41-sl.local' %}
-{% set LAB_CONFIG_NAME='heat-cicd-pike-contrail41-sl' %}
-{% set DOMAIN_NAME='heat-cicd-pike-contrail41-sl.local' %}
-
-# Other salt model repository parameters see in shared-salt.yaml
-
-{% import 'shared-salt.yaml' as SHARED with context %}
-
-{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
-
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
similarity index 98%
rename from tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
rename to tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 0e3707e..c6ffa99 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -67,8 +67,8 @@
     l8kv0xXAElriC1RE1CNtvoOn/uxyRs+2OnNgBVxtAGqUWVdpm6CD
     -----END RSA PRIVATE KEY-----
   cicd_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4ELbbhdBkXLOoLnoTJLvKv+uWlFFiyva+OLvt9qhZAWaBhtmh7Kqqqbx5I3QJzTACfFaxDsfdk325OfJZWuyiCzW/Hzn3uKitkBPgy7okNuRaVmEhQej0/2K1Yl1RanGMNq+oi+Nmj4OY47WZ+/0rVqw/wI5qdASyAdLK5/5cowGDSSiQRqaYBS1L0dHEIAnjtCAs9IIWKPmKH8xFZjcdYVQUQXeBF1Sh1aZ4k2Zb7skftPbAh3WSfyhHJrt5p0rF3rARoIabkgtfDBUWYWQ4aUR4LzAeduRq138DncPHNR84cGLbsZp/zcM/EqoNZbRoCHtvj0ScWF2S4XdnJdtj
-  cluster_domain: heat-cicd-pike-contrail41-sl.local
-  cluster_name: heat-cicd-pike-contrail41-sl
+  cluster_domain: heat-cicd-queens-contrail41-sl.local
+  cluster_name: heat-cicd-queens-contrail41-sl
   opencontrail_version: 4.1
   linux_repo_contrail_component: oc41
   compute_bond_mode: active-backup
@@ -237,7 +237,7 @@
   tenant_network_subnet: ==IPV4_NET_TENANT_PREFIX==.0/24
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
-  openldap_domain: heat-cicd-pike-contrail41-sl.local
+  openldap_domain: heat-cicd-queens-contrail41-sl.local
   openldap_enabled: 'True'
   openldap_organisation: ${_param:cluster_name}
   ceph_enabled: 'True'
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-environment.yaml
similarity index 100%
rename from tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml
rename to tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-environment.yaml
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt.yaml
new file mode 100644
index 0000000..720add3
--- /dev/null
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt.yaml
@@ -0,0 +1,14 @@
+{% set HOSTNAME_CFG01='cfg01.heat-cicd-queens-contrail41-sl.local' %}
+{% set LAB_CONFIG_NAME='heat-cicd-queens-contrail41-sl' %}
+{% set DOMAIN_NAME='heat-cicd-queens-contrail41-sl.local' %}
+
+# Other salt model repository parameters see in shared-salt.yaml
+
+{% import 'shared-salt.yaml' as SHARED with context %}
+
+{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
+
+{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
+
+{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
+
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay--user-data-foundation.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay--user-data-foundation.yaml
similarity index 100%
rename from tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay--user-data-foundation.yaml
rename to tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay--user-data-foundation.yaml
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
similarity index 100%
rename from tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay-userdata.yaml
rename to tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
similarity index 99%
rename from tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
rename to tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
index e421244..3ffdb42 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
@@ -2,12 +2,12 @@
 
 heat_template_version: queens
 
-description: MCP environment for heat-cicd-pike-contrail41-sl
+description: MCP environment for heat-cicd-queens-contrail41-sl
 
 parameters:
   instance_domain:
     type: string
-    default: heat-cicd-pike-contrail41-sl.local
+    default: heat-cicd-queens-contrail41-sl.local
   mcp_version:
     type: string
   env_name: