diff --git a/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr--user-data-cfg01.yaml b/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr--user-data-cfg01.yaml
index 45ad5cf..479fd38 100644
--- a/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr--user-data-cfg01.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr--user-data-cfg01.yaml
@@ -50,7 +50,8 @@
    - echo "nameserver 172.18.208.44 >> /etc/resolv.conf;
    - echo "nameserver 8.8.8.8 >> /etc/resolv.conf;
    - which wget >/dev/null || (apt-get update; apt-get install -y wget);
-   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial nightly salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+
+   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
    - wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
    - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
    - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
diff --git a/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr--user-data1604.yaml b/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr--user-data1604.yaml
index 2c3cb6c..22b9d19 100644
--- a/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr--user-data1604.yaml
@@ -48,13 +48,11 @@
    #- sleep 120
    - echo "Preparing base OS"
    - which wget >/dev/null || (apt-get update; apt-get install -y wget)
-   - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security extra tcp tcp-salt" > /etc/apt/sources.list
-   - wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
-   # saltstack repo is for minions that have the same version in the xenial and trusty (2016.3.3)
-   #- echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/saltstack.list
-   #- wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
-   - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list
-   - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -
+
+   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+   - wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
+   - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
+   - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
 
    - apt-get clean
    - eatmydata apt-get update && apt-get -y upgrade
diff --git a/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr.yaml b/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr.yaml
index 254d82f..89d2311 100644
--- a/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp-ocata-dvr.yaml
@@ -1,6 +1,9 @@
-{% import 'underlay/virtual-mcp-ocata-dvr--meta-data.yaml' as CLOUDINIT_META_DATA %}
-{% import 'underlay/virtual-mcp-ocata-dvr--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 %}
-{% import 'underlay/virtual-mcp-ocata-dvr--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 %}
+# Set the repository suite, one of the: 'nightly', 'testing', 'stable', or any other required
+{% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'stable') %}
+
+{% import 'underlay/virtual-mcp-ocata-dvr--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
+{% import 'underlay/virtual-mcp-ocata-dvr--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 with context %}
+{% import 'underlay/virtual-mcp-ocata-dvr--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 with context %}
 
 ---
 aliases:
@@ -21,7 +24,7 @@
 
 template:
   devops_settings:
-    env_name: {{ os_env('ENV_NAME', 'virtual-mcp-ocata-dvr') }}
+    env_name: {{ os_env('ENV_NAME', 'virtual-mcp-ocata-dvr_' + REPOSITORY_SUITE + "_" + os_env('BUILD_NUMBER', '')) }}
 
     address_pools:
       private-pool01:
diff --git a/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs--user-data-cfg01.yaml b/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs--user-data-cfg01.yaml
index 45ad5cf..479fd38 100644
--- a/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs--user-data-cfg01.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs--user-data-cfg01.yaml
@@ -50,7 +50,8 @@
    - echo "nameserver 172.18.208.44 >> /etc/resolv.conf;
    - echo "nameserver 8.8.8.8 >> /etc/resolv.conf;
    - which wget >/dev/null || (apt-get update; apt-get install -y wget);
-   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial nightly salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+
+   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
    - wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
    - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
    - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
diff --git a/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs--user-data1604.yaml b/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs--user-data1604.yaml
index 2c3cb6c..22b9d19 100644
--- a/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs--user-data1604.yaml
@@ -48,13 +48,11 @@
    #- sleep 120
    - echo "Preparing base OS"
    - which wget >/dev/null || (apt-get update; apt-get install -y wget)
-   - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security extra tcp tcp-salt" > /etc/apt/sources.list
-   - wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
-   # saltstack repo is for minions that have the same version in the xenial and trusty (2016.3.3)
-   #- echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/saltstack.list
-   #- wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
-   - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list
-   - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -
+
+   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+   - wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
+   - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
+   - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
 
    - apt-get clean
    - eatmydata apt-get update && apt-get -y upgrade
diff --git a/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs.yaml b/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs.yaml
index 7967ad9..d4dd39e 100644
--- a/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp-ocata-ovs.yaml
@@ -1,6 +1,9 @@
-{% import 'underlay/virtual-mcp-ocata-ovs--meta-data.yaml' as CLOUDINIT_META_DATA %}
-{% import 'underlay/virtual-mcp-ocata-ovs--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 %}
-{% import 'underlay/virtual-mcp-ocata-ovs--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 %}
+# Set the repository suite, one of the: 'nightly', 'testing', 'stable', or any other required
+{% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'stable') %}
+
+{% import 'underlay/virtual-mcp-ocata-ovs--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
+{% import 'underlay/virtual-mcp-ocata-ovs--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 with context %}
+{% import 'underlay/virtual-mcp-ocata-ovs--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 with context %}
 
 ---
 aliases:
@@ -21,7 +24,7 @@
 
 template:
   devops_settings:
-    env_name: {{ os_env('ENV_NAME', 'virtual-mcp-ocata-ovs') }}
+    env_name: {{ os_env('ENV_NAME', 'virtual-mcp-ocata-ovs_' + REPOSITORY_SUITE + "_" + os_env('BUILD_NUMBER', '')) }}
 
     address_pools:
       private-pool01:
diff --git a/tcp_tests/templates/underlay/virtual-mcp11-dvr--user-data-cfg01.yaml b/tcp_tests/templates/underlay/virtual-mcp11-dvr--user-data-cfg01.yaml
index 45ad5cf..479fd38 100644
--- a/tcp_tests/templates/underlay/virtual-mcp11-dvr--user-data-cfg01.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp11-dvr--user-data-cfg01.yaml
@@ -50,7 +50,8 @@
    - echo "nameserver 172.18.208.44 >> /etc/resolv.conf;
    - echo "nameserver 8.8.8.8 >> /etc/resolv.conf;
    - which wget >/dev/null || (apt-get update; apt-get install -y wget);
-   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial nightly salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+
+   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
    - wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
    - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
    - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
diff --git a/tcp_tests/templates/underlay/virtual-mcp11-dvr--user-data1604.yaml b/tcp_tests/templates/underlay/virtual-mcp11-dvr--user-data1604.yaml
index 2c3cb6c..22b9d19 100644
--- a/tcp_tests/templates/underlay/virtual-mcp11-dvr--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp11-dvr--user-data1604.yaml
@@ -48,13 +48,11 @@
    #- sleep 120
    - echo "Preparing base OS"
    - which wget >/dev/null || (apt-get update; apt-get install -y wget)
-   - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security extra tcp tcp-salt" > /etc/apt/sources.list
-   - wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
-   # saltstack repo is for minions that have the same version in the xenial and trusty (2016.3.3)
-   #- echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/saltstack.list
-   #- wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
-   - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list
-   - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -
+
+   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+   - wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
+   - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
+   - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
 
    - apt-get clean
    - eatmydata apt-get update && apt-get -y upgrade
diff --git a/tcp_tests/templates/underlay/virtual-mcp11-dvr.yaml b/tcp_tests/templates/underlay/virtual-mcp11-dvr.yaml
index 0e72511..b90c192 100644
--- a/tcp_tests/templates/underlay/virtual-mcp11-dvr.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp11-dvr.yaml
@@ -1,6 +1,9 @@
-{% import 'underlay/virtual-mcp11-dvr--meta-data.yaml' as CLOUDINIT_META_DATA %}
-{% import 'underlay/virtual-mcp11-dvr--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 %}
-{% import 'underlay/virtual-mcp11-dvr--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 %}
+# Set the repository suite, one of the: 'nightly', 'testing', 'stable', or any other required
+{% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'stable') %}
+
+{% import 'underlay/virtual-mcp11-dvr--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
+{% import 'underlay/virtual-mcp11-dvr--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 with context %}
+{% import 'underlay/virtual-mcp11-dvr--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 with context %}
 
 ---
 aliases:
@@ -21,7 +24,7 @@
 
 template:
   devops_settings:
-    env_name: {{ os_env('ENV_NAME', 'virtual-mcp11-dvr') }}
+    env_name: {{ os_env('ENV_NAME', 'virtual-mcp11-dvr_' + REPOSITORY_SUITE + "_" + os_env('BUILD_NUMBER', '')) }}
 
     address_pools:
       private-pool01:
diff --git a/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data-cfg01.yaml b/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data-cfg01.yaml
index 45ad5cf..479fd38 100644
--- a/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data-cfg01.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data-cfg01.yaml
@@ -50,7 +50,8 @@
    - echo "nameserver 172.18.208.44 >> /etc/resolv.conf;
    - echo "nameserver 8.8.8.8 >> /etc/resolv.conf;
    - which wget >/dev/null || (apt-get update; apt-get install -y wget);
-   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial nightly salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+
+   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
    - wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
    - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
    - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
diff --git a/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data1604.yaml b/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data1604.yaml
index 2c3cb6c..05ebd66 100644
--- a/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp11-ovs--user-data1604.yaml
@@ -48,11 +48,9 @@
    #- sleep 120
    - echo "Preparing base OS"
    - which wget >/dev/null || (apt-get update; apt-get install -y wget)
-   - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security extra tcp tcp-salt" > /etc/apt/sources.list
-   - wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
-   # saltstack repo is for minions that have the same version in the xenial and trusty (2016.3.3)
-   #- echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/saltstack.list
-   #- wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
+ 
+   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+   - wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
    - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list
    - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -
 
diff --git a/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk--user-data-cfg01.yaml b/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk--user-data-cfg01.yaml
index 45ad5cf..479fd38 100644
--- a/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk--user-data-cfg01.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk--user-data-cfg01.yaml
@@ -50,7 +50,8 @@
    - echo "nameserver 172.18.208.44 >> /etc/resolv.conf;
    - echo "nameserver 8.8.8.8 >> /etc/resolv.conf;
    - which wget >/dev/null || (apt-get update; apt-get install -y wget);
-   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial nightly salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+
+   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
    - wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
    - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
    - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
diff --git a/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk--user-data1604.yaml b/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk--user-data1604.yaml
index 2c3cb6c..22b9d19 100644
--- a/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk--user-data1604.yaml
@@ -48,13 +48,11 @@
    #- sleep 120
    - echo "Preparing base OS"
    - which wget >/dev/null || (apt-get update; apt-get install -y wget)
-   - echo "deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ xenial main security extra tcp tcp-salt" > /etc/apt/sources.list
-   - wget -O - http://apt.tcpcloud.eu/public.gpg | apt-key add -
-   # saltstack repo is for minions that have the same version in the xenial and trusty (2016.3.3)
-   #- echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/saltstack.list
-   #- wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | apt-key add -
-   - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list
-   - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -
+
+   - echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
+   - wget -O - http://apt-mk.mirantis.com/public.gpg | apt-key add -;
+   - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" > /etc/apt/sources.list.d/saltstack.list;
+   - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -;
 
    - apt-get clean
    - eatmydata apt-get update && apt-get -y upgrade
diff --git a/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk.yaml b/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk.yaml
index a9bea42..81385ac 100644
--- a/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp11-ovs-dpdk.yaml
@@ -1,6 +1,9 @@
-{% import 'underlay/virtual-mcp11-ovs-dpdk--meta-data.yaml' as CLOUDINIT_META_DATA %}
-{% import 'underlay/virtual-mcp11-ovs-dpdk--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 %}
-{% import 'underlay/virtual-mcp11-ovs-dpdk--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 %}
+# Set the repository suite, one of the: 'nightly', 'testing', 'stable', or any other required
+{% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'stable') %}
+
+{% import 'underlay/virtual-mcp11-ovs-dpdk--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
+{% import 'underlay/virtual-mcp11-ovs-dpdk--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 with context %}
+{% import 'underlay/virtual-mcp11-ovs-dpdk--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 with context %}
 
 ---
 aliases:
@@ -21,7 +24,7 @@
 
 template:
   devops_settings:
-    env_name: {{ os_env('ENV_NAME', 'virtual-mcp11-ovs-dpdk') }}
+    env_name: {{ os_env('ENV_NAME', 'virtual-mcp11-ovs-dpdk_' + REPOSITORY_SUITE + "_" + os_env('BUILD_NUMBER', '')) }}
 
     address_pools:
       private-pool01:
diff --git a/tcp_tests/templates/underlay/virtual-mcp11-ovs.yaml b/tcp_tests/templates/underlay/virtual-mcp11-ovs.yaml
index 30ccf90..0a0e3ef 100644
--- a/tcp_tests/templates/underlay/virtual-mcp11-ovs.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp11-ovs.yaml
@@ -1,6 +1,9 @@
-{% import 'underlay/virtual-mcp11-ovs--meta-data.yaml' as CLOUDINIT_META_DATA %}
-{% import 'underlay/virtual-mcp11-ovs--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 %}
-{% import 'underlay/virtual-mcp11-ovs--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 %}
+# Set the repository suite, one of the: 'nightly', 'testing', 'stable', or any other required
+{% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'stable') %}
+
+{% import 'underlay/virtual-mcp11-ovs--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
+{% import 'underlay/virtual-mcp11-ovs--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 with context %}
+{% import 'underlay/virtual-mcp11-ovs--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 with context %}
 
 ---
 aliases:
@@ -21,7 +24,7 @@
 
 template:
   devops_settings:
-    env_name: {{ os_env('ENV_NAME', 'virtual-mcp11-ovs') }}
+    env_name: {{ os_env('ENV_NAME', 'virtual-mcp11-ovs_' + REPOSITORY_SUITE + "_" + os_env('BUILD_NUMBER', '')) }}
 
     address_pools:
       private-pool01: