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: