diff --git a/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml b/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
index d6805f8..44b82ae 100644
--- a/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
+++ b/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
@@ -10,7 +10,7 @@
         enp3s0f0:
           role: management_single
         enp3s0f1:
-          role: control_bond0
+          role: control_vlan_bond0
 
     kvm02.mcp11-ovs-dpdk.local:
       reclass_storage_name: infra_kvm_node02
@@ -21,7 +21,7 @@
         eno1:
           role: management_single
         eno2:
-          role: control_bond0
+          role: control_vlan_bond0
 
     kvm03.mcp11-ovs-dpdk.local:
       reclass_storage_name: infra_kvm_node03
@@ -32,7 +32,7 @@
         eno1:
           role: management_single
         eno2:
-          role: control_bond0
+          role: control_vlan_bond0
 
     cmp001.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_compute_node01
@@ -43,9 +43,9 @@
         enp3s0f0:
           role: management_single
         enp3s0f1:
-          role: control_bond0
+          role: control_vlan_bond0
         enp5s0f0:
-          role: control_bond0
+          role: control_vlan_bond0
         enp5s0f1:
           role: private_dpdk_ovs
           dpdk_pci: '0000:05:00.1'
@@ -62,9 +62,9 @@
         eno1:
           role: management_single
         eth0:
-          role: control_bond0
+          role: control_vlan_bond0
         eth3:
-          role: control_bond0
+          role: control_vlan_bond0
         eth2:
           role: private_dpdk_ovs
           dpdk_pci: '0000:05:00.1'
diff --git a/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml b/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
index 71ee047..d68787c 100644
--- a/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
+++ b/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
@@ -1,56 +1,117 @@
 nodes:
+    kvm01.mcp11-ovs-dpdk.local:
+      reclass_storage_name: infra_kvm_node01
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        ens4:
+          role: control_vcp_single
+
+    kvm02.mcp11-ovs-dpdk.local:
+      reclass_storage_name: infra_kvm_node02
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        ens4:
+          role: control_vcp_single
+
+    kvm03.mcp11-ovs-dpdk.local:
+      reclass_storage_name: infra_kvm_node03
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        ens4:
+          role: control_vcp_single
+
+    cid01.mcp11-ovs-dpdk.local:
+      reclass_storage_name: cicd_control_node01
+      roles:
+      - cicd_control_leader
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: control_vcp_single
+
+    cid02.mcp11-ovs-dpdk.local:
+      reclass_storage_name: cicd_control_node02
+      roles:
+      - cicd_control_manager
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: control_vcp_single
+
+    cid03.mcp11-ovs-dpdk.local:
+      reclass_storage_name: cicd_control_node03
+      roles:
+      - cicd_control_manager
+      - linux_system_codename_xenial
+      interfaces:
+        ens3:
+          role: control_vcp_single
+
     ctl01.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_control_node01
       roles:
       - openstack_control_leader
+      - openstack_designate
+      - openstack_designate_keystone
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     ctl02.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_control_node02
       roles:
       - openstack_control
+      - openstack_designate
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     ctl03.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_control_node03
       roles:
       - openstack_control
+      - openstack_designate
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     dbs01.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_database_node01
       roles:
       - openstack_database_leader
+      - openstack_designate_database
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     dbs02.mcp11-ovs-dpdk.local:
-      reclass_storage_name: openstack_database_node01
+      reclass_storage_name: openstack_database_node02
       roles:
       - openstack_database
+      - openstack_designate_database
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     dbs03.mcp11-ovs-dpdk.local:
-      reclass_storage_name: openstack_database_node01
+      reclass_storage_name: openstack_database_node03
       roles:
       - openstack_database
+      - openstack_designate_database
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     msg01.mcp11-ovs-dpdk.local:
@@ -59,7 +120,7 @@
       - openstack_message_queue
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     msg02.mcp11-ovs-dpdk.local:
@@ -68,7 +129,7 @@
       - openstack_message_queue
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     msg03.mcp11-ovs-dpdk.local:
@@ -77,7 +138,7 @@
       - openstack_message_queue
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     mdb01.mcp11-ovs-dpdk.local:
@@ -86,7 +147,7 @@
       - openstack_telemetry
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     mdb02.mcp11-ovs-dpdk.local:
@@ -95,7 +156,7 @@
       - openstack_telemetry
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     mdb03.mcp11-ovs-dpdk.local:
@@ -104,7 +165,7 @@
       - openstack_telemetry
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     prx01.mcp11-ovs-dpdk.local:
@@ -113,7 +174,7 @@
       - openstack_proxy
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     prx02.mcp11-ovs-dpdk.local:
@@ -122,7 +183,7 @@
       - openstack_proxy
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     mtr01.mcp11-ovs-dpdk.local:
@@ -131,7 +192,7 @@
       - stacklight_telemetry
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     mtr02.mcp11-ovs-dpdk.local:
@@ -140,7 +201,7 @@
       - stacklight_telemetry
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     mtr03.mcp11-ovs-dpdk.local:
@@ -149,7 +210,7 @@
       - stacklight_telemetry
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     log01.mcp11-ovs-dpdk.local:
@@ -158,7 +219,7 @@
       - stacklight_log_leader
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     log02.mcp11-ovs-dpdk.local:
@@ -167,7 +228,7 @@
       - stacklight_log
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     log03.mcp11-ovs-dpdk.local:
@@ -176,7 +237,7 @@
       - stacklight_log
       - linux_system_codename_xenial
       interfaces:
-        ens4:
+        ens3:
           role: control_vcp_single
 
     # Generator-based computes. For compatibility only
diff --git "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/.cookiecutter_compute.yml" "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/.cookiecutter_compute.yml"
index 6fbf04f..2e1e8e4 100644
--- "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/.cookiecutter_compute.yml"
+++ "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/.cookiecutter_compute.yml"
@@ -1,51 +1,3 @@
-classes:
-{%- if cookiecutter.get('local_repositories', 'False') == 'True' %}
-- system.linux.system.repo_local.ubuntu
-- system.linux.system.repo_local.mcp.openstack
-- system.linux.system.repo_local.mcp.extra
-{%- if cookiecutter.openstack_network_engine == 'opencontrail' %}
-- system.linux.system.repo_local.mcp.contrail
-{%- endif %}
-{%- else %}
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.saltstack.xenial
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-{%- if cookiecutter.openstack_network_engine == 'opencontrail' %}
-- system.linux.system.repo.mcp.contrail
-{%- endif %}
-{%- endif %}
-{%- if cookiecutter.get('openstack_nova_compute_nfv_req_enabled', 'False') == 'True' or cookiecutter.get('openstack_nfv_dpdk_enabled', 'False') == 'True' %}
-- system.nova.compute.nfv.hugepages
-- system.nova.compute.nfv.cpu_pinning
-{%- endif %}
-- system.nova.compute.cluster
-{%- if cookiecutter.openstack_network_engine == 'opencontrail' %}
-- system.opencontrail.compute.cluster
-- system.opencontrail.client.cluster
-- system.opencontrail.client.resource.virtual_router
-{%- elif cookiecutter.openstack_network_engine == 'ovs' %}
-- system.neutron.compute.cluster
-{%- endif %}
-- system.ceilometer.agent.cluster
-- cluster.{{ cookiecutter.cluster_name }}.infra
-parameters:
-  _param:
-    cluster_vip_address: ${_param:openstack_control_address}
-    cluster_local_address: ${_param:single_address}
-    cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
-    cluster_node01_address: ${_param:openstack_control_node01_address}
-    cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
-    cluster_node02_address: ${_param:openstack_control_node02_address}
-    cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
-    cluster_node03_address: ${_param:openstack_control_node03_address}
-{%- if cookiecutter.openstack_network_engine == 'opencontrail' %}
-    opencontrail_compute_address: ${_param:tenant_address}
-{%- endif %}
-    nova_vncproxy_url: https://${_param:cluster_public_host}:6080
-    primary_first_nic: {{ cookiecutter.compute_primary_first_nic }}
-    primary_second_nic: {{ cookiecutter.compute_primary_second_nic }}
-
   linux:
     network:
       host:
@@ -70,7 +22,15 @@
           proto: manual
           name: ${_param:primary_second_nic}
           master: bond0
+
+
     {%- if cookiecutter.openstack_network_engine == 'ovs' %}
+
+
+
+
+
+      bridge: openvswitch
       {%- if not cookiecutter.openstack_ovs_dvr_enabled == 'True' %}
         {%- if cookiecutter.openstack_ovs_encapsulation_type == 'vxlan' %}
         bond0:
@@ -128,6 +88,7 @@
           address: ${_param:single_address}
           netmask: ${_param:control_network_netmask}
         {%- endif %}
+
       {%- elif cookiecutter.openstack_ovs_dvr_enabled == 'True' %}
         bond0:
           enabled: true
@@ -178,7 +139,13 @@
           peer: floating-to-prv
         {%- endif %}
       {%- endif %}
-      bridge: openvswitch
+    
+    
+    
+    
+    
+    
+    
     {%- elif cookiecutter.openstack_network_engine == 'opencontrail' %}
         bond0:
           mtu: 9000
@@ -223,4 +190,8 @@
           - ${_param:dns_server01}
           - ${_param:dns_server02}
     {%- endif %}
+
+
+
+
   {%- endif %}
diff --git "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_bond0" "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_bond0"
index 38874e5..e47c2b2 100644
--- "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_bond0"
+++ "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_bond0"
@@ -22,14 +22,6 @@
                 {%- for interface_name in interfaces.keys() %}
                 - {{ interface_name }}
                 {%- endfor %}
-              bond0.2416:
-                enabled: true
-                proto: manual
-                type: vlan
-                use_interfaces:
-                - bond0
-                require_interfaces:
-                - bond0
               br_ctl:
                 address: ${_param:_esc}{_param:single_address}
                 enabled: true
@@ -37,6 +29,6 @@
                 proto: static
                 type: bridge
                 use_interfaces:
-                - bond0.2416
+                - bond0
                 require_interfaces:
-                - bond0.2416
+                - bond0
diff --git "a/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_vlan_bond0" "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_vlan_bond0"
new file mode 100644
index 0000000..38874e5
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 interfaces \043\175/control_vlan_bond0"
@@ -0,0 +1,42 @@
+
+              # {{ interfaces_role }}
+              {%- for interface_name, interface in interfaces.items() %}
+              {{ interface_name }}:
+                enabled: true
+                name: {{ interface_name }}
+                proto: manual
+                type: eth
+                ipflush_onchange: true
+              {%- endfor %}
+              bond0:
+                enabled: true
+                mode: active-backup
+                proto: manual
+                slaves: {{ ' '.join(interfaces.keys()) }}
+                type: bond
+                use_interfaces:
+                {%- for interface_name in interfaces.keys() %}
+                - {{ interface_name }}
+                {%- endfor %}
+                require_interfaces:
+                {%- for interface_name in interfaces.keys() %}
+                - {{ interface_name }}
+                {%- endfor %}
+              bond0.2416:
+                enabled: true
+                proto: manual
+                type: vlan
+                use_interfaces:
+                - bond0
+                require_interfaces:
+                - bond0
+              br_ctl:
+                address: ${_param:_esc}{_param:single_address}
+                enabled: true
+                netmask: 255.255.255.0
+                proto: static
+                type: bridge
+                use_interfaces:
+                - bond0.2416
+                require_interfaces:
+                - bond0.2416
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_leader" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_leader"
new file mode 100644
index 0000000..562647c
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_leader"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+  reclass:
+    storage:
+      node:
+        <reclass_storage_node_name>:
+          classes:
+#}
+          - cluster.${_param:cluster_name}.cicd.control.leader
\ No newline at end of file
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_manager" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_manager"
new file mode 100644
index 0000000..12d220e
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/cicd_control_manager"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+  reclass:
+    storage:
+      node:
+        <reclass_storage_node_name>:
+          classes:
+#}
+          - cluster.${_param:cluster_name}.cicd.control.manager
\ No newline at end of file
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate"
new file mode 100644
index 0000000..c945427
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+  reclass:
+    storage:
+      node:
+        <reclass_storage_node_name>:
+          classes:
+#}
+          - environment.{{ cookiecutter._env_name }}.features.designate.system
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_database" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_database"
new file mode 100644
index 0000000..006235a
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_database"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+  reclass:
+    storage:
+      node:
+        <reclass_storage_node_name>:
+          classes:
+#}
+          - environment.{{ cookiecutter._env_name }}.features.designate.database
diff --git "a/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_keystone" "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_keystone"
new file mode 100644
index 0000000..5e1b3c7
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\043 roles \043\175/openstack_designate_keystone"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+  reclass:
+    storage:
+      node:
+        <reclass_storage_node_name>:
+          classes:
+#}
+          - environment.{{ cookiecutter._env_name }}.features.designate.keystone
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/database.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/database.yml"
new file mode 100644
index 0000000..e1e12d7
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/database.yml"
@@ -0,0 +1,3 @@
+classes:
+- system.galera.server.database.designate
+- environment.{{ cookiecutter._env_name }}.features.designate
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/init.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/init.yml"
new file mode 100644
index 0000000..33f4259
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/init.yml"
@@ -0,0 +1,38 @@
+{%- macro password(size=16) -%}
+{% for index in range(size) %}{{ 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'|random }}{% endfor %}
+{%- endmacro -%}
+parameters:
+  _param:
+    # Put overrides for any environment-specific variables here
+    powerdns_webserver_password: {{ password(12) }}
+    powerdns_webserver_port: 8081
+    designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+    designate_pdns_api_key: {{ password(12) }}
+    designate_pdns_api_endpoint: "http://${_param:openstack_control_node01_address}:${_param:powerdns_webserver_port}"
+    designate_pool_ns_records:
+      - hostname: 'ns1.example.org.'
+        priority: 10
+    designate_pool_nameservers:
+      - host: ${_param:openstack_control_node01_address}
+        port: 53
+      - host: ${_param:openstack_control_node02_address}
+        port: 53
+      - host: ${_param:openstack_control_node03_address}
+        port: 53
+    designate_pool_target_type: pdns4
+    designate_pool_target_masters:
+      - host: ${_param:openstack_control_node01_address}
+        port: 5354
+      - host: ${_param:openstack_control_node02_address}
+        port: 5354
+      - host: ${_param:openstack_control_node03_address}
+        port: 5354
+    designate_pool_target_options:
+      host: ${_param:openstack_control_node01_address}
+      port: 53
+      api_token: ${_param:designate_pdns_api_key}
+      api_endpoint: ${_param:designate_pdns_api_endpoint}
+    designate_version: ${_param:openstack_version}
+    designate_service_host: ${_param:openstack_control_address}
+    mysql_designate_password: {{ password(16) }}
+    keystone_designate_password: {{ password(16) }}
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/keystone.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/keystone.yml"
new file mode 100644
index 0000000..4726bf6
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/keystone.yml"
@@ -0,0 +1,3 @@
+classes:
+- system.keystone.client.service.designate
+- environment.{{ cookiecutter._env_name }}.features.designate
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/system.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/system.yml"
new file mode 100644
index 0000000..3fa26a6
--- /dev/null
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/features/designate/system.yml"
@@ -0,0 +1,38 @@
+classes:
+- system.designate.server.cluster
+- system.designate.server.backend.pdns
+- environment.{{ cookiecutter._env_name }}.features.designate
+parameters:
+  powerdns:
+    server:
+      axfr_ips:
+        - ${_param:openstack_control_node01_address}
+        - ${_param:openstack_control_node02_address}
+        - ${_param:openstack_control_node03_address}
+        - 127.0.0.1
+  designate:
+    server:
+      pools:
+        default:
+          description: 'test pool'
+          targets:
+            default:
+              description: 'test target1'
+            default1:
+              type: ${_param:designate_pool_target_type}
+              description: 'test target2'
+              masters: ${_param:designate_pool_target_masters}
+              options:
+                host: ${_param:openstack_control_node02_address}
+                port: 53
+                api_endpoint: "http://${_param:openstack_control_node02_address}:${_param:powerdns_webserver_port}"
+                api_token: ${_param:designate_pdns_api_key}
+            default2:
+              type: ${_param:designate_pool_target_type}
+              description: 'test target3'
+              masters: ${_param:designate_pool_target_masters}
+              options:
+                host: ${_param:openstack_control_node03_address}
+                port: 53
+                api_endpoint: "http://${_param:openstack_control_node03_address}:${_param:powerdns_webserver_port}"
+                api_token: ${_param:designate_pdns_api_key}
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
index 600697e..feffa64 100644
--- "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/init.yml"
@@ -1,3 +1,5 @@
+{# 'infra_config_classes' list object is dynamically generated from 'roles' to add on the cfg node #}
+{%- set infra_config_classes = [] %}
 parameters:
   _param:
     _esc: $
@@ -6,6 +8,7 @@
       node:
       {%- for inventory_node_name, node in nodes.items()|sort %}
         {{ node['reclass_storage_name'] }}:
+        {# 'params' dict object is dynamically generated from 'roles' to add on the node #}
         {%- set params = {} %}
           classes:
           {#- Default role linux_network_interface is added to each node #}
@@ -21,3 +24,10 @@
         {%- endif %}
 
       {%- endfor %}
+
+classes:
+# Enable root and *ALL* users access
+- system.openssh.server.team.all
+{%- for infra_config_class in infra_config_classes %}
+- {{ infra_config_class }}
+{%- endfor %}
diff --git "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml" "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml"
index 8474d17..f74e880 100644
--- "a/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml"
+++ "b/tcp_tests/environment/environment_template/\173\173 cookiecutter._env_name \175\175/linux_network_interface.yml"
@@ -1,3 +1,6 @@
+classes:
+# Enable root and *ALL* users access
+- system.openssh.server.team.all
 parameters:
   # _param:
   # Put overrides for any environment-specific variables here