diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/core.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/core.yaml
similarity index 81%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/core.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/core.yaml
index 4ab0f03..2d79d55 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/core.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/core.yaml
@@ -1,8 +1,8 @@
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_CFG01 with context %}
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_KVM01 with context %}
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_KVM02 with context %}
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_KVM03 with context %}
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_CFG01 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_CFG01 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_KVM01 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_KVM02 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_KVM03 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_CFG01 with context %}
 
 # Install support services
 - description: Sync all
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/k8s.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/k8s.yaml
similarity index 97%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/k8s.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/k8s.yaml
index 326d20e..c505c58 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/k8s.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/k8s.yaml
@@ -1,5 +1,5 @@
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_CFG01 with context %}
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_CTL01 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_CFG01 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_CTL01 with context %}
 
 {%- macro MACRO_CHECK_SYSTEMCTL() %}
 {#######################################}
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/lab04-upgrade-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/lab04-upgrade-physical-inventory.yaml
similarity index 88%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/lab04-upgrade-physical-inventory.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/lab04-upgrade-physical-inventory.yaml
index 7c01fe1..ad4e04a 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/lab04-upgrade-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/lab04-upgrade-physical-inventory.yaml
@@ -1,5 +1,5 @@
 nodes:
-    cfg01.bm-mcp-pike-k8s-contrail.local:
+    cfg01.bm-k8s-contrail.local:
       reclass_storage_name: infra_config_node01
       roles:
       - infra_config
@@ -9,7 +9,7 @@
           role: single_dhcp
     # Physical nodes
 
-    kvm01.bm-mcp-pike-k8s-contrail.local:
+    kvm01.bm-k8s-contrail.local:
       reclass_storage_name: infra_kvm_node01
       roles:
       - infra_kvm
@@ -20,7 +20,7 @@
         enp9s0f1:
           role: single_vlan_ctl
 
-    kvm02.bm-mcp-pike-k8s-contrail.local:
+    kvm02.bm-k8s-contrail.local:
       reclass_storage_name: infra_kvm_node02
       roles:
       - infra_kvm
@@ -31,7 +31,7 @@
         enp9s0f1:
           role: single_vlan_ctl
 
-    kvm03.bm-mcp-pike-k8s-contrail.local:
+    kvm03.bm-k8s-contrail.local:
       reclass_storage_name: infra_kvm_node03
       roles:
       - infra_kvm
@@ -42,7 +42,7 @@
         enp9s0f1:
           role: single_vlan_ctl
 
-    ctl01.bm-mcp-pike-k8s-contrail.local:
+    ctl01.bm-k8s-contrail.local:
       reclass_storage_name: kubernetes_control_node01
       roles:
       - kubernetes_control_contrail
@@ -55,7 +55,7 @@
           role: single_vlan_ctl
           single_address: 10.167.8.239
 
-    ctl02.bm-mcp-pike-k8s-contrail.local:
+    ctl02.bm-k8s-contrail.local:
       reclass_storage_name: kubernetes_control_node02
       roles:
       - kubernetes_control_contrail
@@ -68,7 +68,7 @@
           role: single_vlan_ctl
           single_address: 10.167.8.238
 
-    ctl03.bm-mcp-pike-k8s-contrail.local:
+    ctl03.bm-k8s-contrail.local:
       reclass_storage_name: kubernetes_control_node03
       roles:
       - kubernetes_control_contrail
@@ -92,7 +92,7 @@
           role: single_dhcp
         ens11f1:
           role: k8s_oc40_only_vhost_on_control_vlan
-          #    cmp001.bm-mcp-pike-k8s-contrail.local:
+          #    cmp001.bm-k8s-contrail.local:
           #      reclass_storage_name: kubernetes_compute_node001
           #      roles:
           #      - linux_system_codename_xenial
@@ -105,7 +105,7 @@
           #          role: k8s_oc40_only_vhost_on_control_vlan
           #          single_address: 10.167.8.103
           #
-          #    cmp002.bm-mcp-pike-k8s-contrail.local:
+          #    cmp002.bm-k8s-contrail.local:
           #      reclass_storage_name: kubernetes_compute_node002
           #      roles:
           #      - linux_system_codename_xenial
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
similarity index 100%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-environment.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-environment.yaml
similarity index 80%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-environment.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-environment.yaml
index 47e12c8..206dead 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-environment.yaml
@@ -1,5 +1,5 @@
 nodes:
-    mon01.cookied-bm-mcp-ocata-contrail.local:
+    mon01.bm-k8s-contrail.local:
       reclass_storage_name: stacklight_server_node01
       roles:
       - stacklightv2_server_leader
@@ -8,7 +8,7 @@
         ens3:
           role: single_ctl
 
-    mon02.cookied-bm-mcp-ocata-contrail.local:
+    mon02.bm-k8s-contrail.local:
       reclass_storage_name: stacklight_server_node02
       roles:
       - stacklightv2_server
@@ -17,7 +17,7 @@
         ens3:
           role: single_ctl
 
-    mon03.cookied-bm-mcp-ocata-contrail.local:
+    mon03.bm-k8s-contrail.local:
       reclass_storage_name: stacklight_server_node03
       roles:
       - stacklightv2_server
@@ -26,7 +26,7 @@
         ens3:
           role: single_ctl
 
-    mtr01.cookied-bm-mcp-ocata-contrail.local:
+    mtr01.bm-k8s-contrail.local:
       reclass_storage_name: stacklight_telemetry_node01
       roles:
       - stacklight_telemetry
@@ -35,7 +35,7 @@
         ens3:
           role: single_ctl
 
-    mtr02.cookied-bm-mcp-ocata-contrail.local:
+    mtr02.bm-k8s-contrail.local:
       reclass_storage_name: stacklight_telemetry_node02
       roles:
       - stacklight_telemetry
@@ -44,7 +44,7 @@
         ens3:
           role: single_ctl
 
-    mtr03.cookied-bm-mcp-ocata-contrail.local:
+    mtr03.bm-k8s-contrail.local:
       reclass_storage_name: stacklight_telemetry_node03
       roles:
       - stacklight_telemetry
@@ -53,7 +53,7 @@
         ens3:
           role: single_ctl
 
-    log01.cookied-bm-mcp-ocata-contrail.local:
+    log01.bm-k8s-contrail.local:
       reclass_storage_name: stacklight_log_node01
       roles:
       - stacklight_log_leader_v2
@@ -62,7 +62,7 @@
         ens3:
           role: single_ctl
 
-    log02.cookied-bm-mcp-ocata-contrail.local:
+    log02.bm-k8s-contrail.local:
       reclass_storage_name: stacklight_log_node02
       roles:
       - stacklight_log
@@ -71,7 +71,7 @@
         ens3:
           role: single_ctl
 
-    log03.cookied-bm-mcp-ocata-contrail.local:
+    log03.bm-k8s-contrail.local:
       reclass_storage_name: stacklight_log_node03
       roles:
       - stacklight_log
@@ -80,7 +80,7 @@
         ens3:
           role: single_ctl
 
-    cid01.cookied-bm-mcp-ocata-contrail.local:
+    cid01.bm-k8s-contrail.local:
       reclass_storage_name: cicd_control_node01
       roles:
       - cicd_control_leader
@@ -89,7 +89,7 @@
         ens3:
           role: single_ctl
 
-    cid02.cookied-bm-mcp-ocata-contrail.local:
+    cid02.bm-k8s-contrail.local:
       reclass_storage_name: cicd_control_node02
       roles:
       - cicd_control_manager
@@ -98,7 +98,7 @@
         ens3:
           role: single_ctl
 
-    cid03.cookied-bm-mcp-ocata-contrail.local:
+    cid03.bm-k8s-contrail.local:
       reclass_storage_name: cicd_control_node03
       roles:
       - cicd_control_manager
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/salt.yaml
similarity index 93%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/salt.yaml
index a772448..274fb44 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/salt.yaml
@@ -1,9 +1,9 @@
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_CFG01 with context %}
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import LAB_CONFIG_NAME with context %}
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import DOMAIN_NAME with context %}
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_KVM01 with context %}
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_KVM02 with context %}
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_KVM03 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_CFG01 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import LAB_CONFIG_NAME with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import DOMAIN_NAME with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_KVM01 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_KVM02 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_KVM03 with context %}
 
 {% set SALT_MODELS_REPOSITORY = os_env('SALT_MODELS_REPOSITORY','https://gerrit.mcp.mirantis.com/salt-models/mcp-virtual-lab') %}
 # Other salt model repository parameters see in shared-salt.yaml
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/sl.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/sl.yaml
similarity index 98%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/sl.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/sl.yaml
index 9dcb4f6..cb929e4 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/sl.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/sl.yaml
@@ -1,4 +1,4 @@
-{% from 'cookied-bm-mcp-pike-k8s-contrail/underlay.yaml' import HOSTNAME_CFG01 with context %}
+{% from 'cookied-bm-k8s-contrail/underlay.yaml' import HOSTNAME_CFG01 with context %}
 {% import 'shared-sl-tests.yaml' as SHARED_SL_TESTS with context %}
 
 # Install docker swarm
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/underlay--meta-data.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--meta-data.yaml
similarity index 100%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/underlay--meta-data.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/underlay--meta-data.yaml
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/underlay--user-data-cfg01.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data-cfg01.yaml
similarity index 100%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/underlay--user-data-cfg01.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data-cfg01.yaml
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/underlay--user-data1604-hwe-compute.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604-hwe-compute.yaml
similarity index 100%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/underlay--user-data1604-hwe-compute.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604-hwe-compute.yaml
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604.yaml
similarity index 100%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/underlay--user-data1604.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604.yaml
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/underlay.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay.yaml
similarity index 96%
rename from tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/underlay.yaml
rename to tcp_tests/templates/cookied-bm-k8s-contrail/underlay.yaml
index 7832675..089f343 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/underlay.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay.yaml
@@ -1,8 +1,8 @@
 # Set the repository suite, one of the: 'nightly', 'testing', 'stable', or any other required
-{% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'testing') %}
+{% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'proposed') %}
 
 #{% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'physical_mcp11_ovs_dpdk') + '.local' %}
-{% set LAB_CONFIG_NAME = os_env('LAB_CONFIG_NAME', 'cookied-bm-mcp-pike-k8s-contrail') %}
+{% set LAB_CONFIG_NAME = os_env('LAB_CONFIG_NAME', 'cookied-bm-k8s-contrail') %}
 {% set DOMAIN_NAME = os_env('DOMAIN_NAME', LAB_CONFIG_NAME + '.local') %}
 {% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
 {% set HOSTNAME_KVM01 = os_env('HOSTNAME_KVM01', 'kvm01.' + DOMAIN_NAME) %}
@@ -22,10 +22,10 @@
 {% set ETH0_IP_ADDRESS_CTL01 = os_env('ETH0_IP_ADDRESS_CTL01', '172.17.41.9') %}
 {% set ETH0_IP_ADDRESS_CTL02 = os_env('ETH0_IP_ADDRESS_CTL02', '172.17.41.10') %}
 {% set ETH0_IP_ADDRESS_CTL03 = os_env('ETH0_IP_ADDRESS_CTL03', '172.17.41.11') %}
-{% import 'cookied-bm-mcp-pike-k8s-contrail/underlay--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
-{% import 'cookied-bm-mcp-pike-k8s-contrail/underlay--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 with context %}
-{% import 'cookied-bm-mcp-pike-k8s-contrail/underlay--user-data1604.yaml' as CLOUDINIT_USER_DATA with context %}
-{% import 'cookied-bm-mcp-pike-k8s-contrail/underlay--user-data1604-hwe-compute.yaml' as CLOUDINIT_USER_DATA_HWE_CMP with context %}
+{% import 'cookied-bm-k8s-contrail/underlay--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
+{% import 'cookied-bm-k8s-contrail/underlay--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 with context %}
+{% import 'cookied-bm-k8s-contrail/underlay--user-data1604.yaml' as CLOUDINIT_USER_DATA with context %}
+{% import 'cookied-bm-k8s-contrail/underlay--user-data1604-hwe-compute.yaml' as CLOUDINIT_USER_DATA_HWE_CMP with context %}
 
 ---
 aliases:
@@ -38,7 +38,7 @@
 
 template:
   devops_settings:
-    env_name: {{ os_env('ENV_NAME', 'cookied-bm-mcp-pike-k8s-contrail_' + REPOSITORY_SUITE + "_" + os_env('BUILD_NUMBER', '')) }}
+    env_name: {{ os_env('ENV_NAME', 'cookied-bm-k8s-contrail_' + REPOSITORY_SUITE + "_" + os_env('BUILD_NUMBER', '')) }}
 
     address_pools:
       admin-pool01: