diff --git a/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml b/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml
index fd49492..ca761a3 100644
--- a/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml
@@ -1,4 +1,7 @@
 default_context:
+  barbican_backend: dogtag
+  barbican_enabled: 'False'
+  auditd_enabled: 'False'
   bmk_enabled: 'False'
   ceph_enabled: 'False'
   cicd_enabled: 'False'
@@ -52,6 +55,10 @@
   openstack_compute_rack01_hostname: cmp
   openstack_compute_rack01_single_subnet: 172.16.10
   openstack_compute_rack01_tenant_subnet: 10.1.0
+  openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.150
+  openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.150
+  openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.150
+  openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.150
   openstack_control_address: 172.16.10.100
   openstack_control_hostname: ctl
   openstack_control_node01_address: 172.16.10.101
@@ -101,6 +108,11 @@
   openstack_proxy_node02_address: 172.16.10.122
   openstack_proxy_node02_hostname: prx02
   openstack_upgrade_node01_address: 172.16.10.19
+  openstack_dns_hostname: dns
+  openstack_dns_node01_address: 172.16.10.111
+  openstack_dns_node01_hostname: dns01
+  openstack_dns_node02_address: 172.16.10.112
+  openstack_dns_node02_hostname: dns02
   openstack_version: queens
   oss_enabled: 'False'
   oss_node03_address: ${_param:stacklight_monitor_node03_address}
@@ -184,3 +196,12 @@
   use_default_network_scheme: 'False'
   rsync_fernet_rotation: 'True'
   compute_padding_with_zeros: False
+  designate_backend: powerdns
+  designate_enabled: 'False'
+  nova_vnc_tls_enabled: 'False'
+  galera_ssl_enabled: 'False'
+  openstack_mysql_x509_enabled: 'False'
+  rabbitmq_ssl_enabled: 'False'
+  openstack_rabbitmq_x509_enabled: 'False'
+  tenant_telemetry_enabled: 'False'
+  gnocchi_aggregation_storage: file
diff --git a/tcp_tests/templates/cookied-mcp-queens-ovs/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-queens-ovs/_context-environment.yaml
index 4c7091b..610ea7a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-ovs/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-ovs/_context-environment.yaml
@@ -1,5 +1,5 @@
 nodes:
-    cfg01.mcp11-ovs-dpdk.local:
+    cfg01.mcp-queens-ovs.local:
       reclass_storage_name: infra_config_node01
       roles:
       - infra_config
@@ -10,17 +10,13 @@
         ens4:
           role: single_ctl
 
-    ctl01.mcp11-ovs-dpdk.local:
+    ctl01.mcp-queens-ovs.local:
       reclass_storage_name: openstack_control_node01
       roles:
       - infra_kvm
       - openstack_control_leader
       - openstack_database_leader
       - openstack_message_queue
-    #  - features_designate_bind9_database
-    #  - features_designate_bind9_dns
-    #  - features_designate_bind9
-    #  - features_designate_bind9_keystone
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -28,16 +24,13 @@
         ens4:
           role: single_ctl
 
-    ctl02.mcp11-ovs-dpdk.local:
+    ctl02.mcp-queens-ovs.local:
       reclass_storage_name: openstack_control_node02
       roles:
       - infra_kvm
       - openstack_control
       - openstack_database
       - openstack_message_queue
-    #  - features_designate_bind9_database
-    #  - features_designate_bind9_dns
-    #  - features_designate_bind9
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -45,15 +38,13 @@
         ens4:
           role: single_ctl
 
-    ctl03.mcp11-ovs-dpdk.local:
+    ctl03.mcp-queens-ovs.local:
       reclass_storage_name: openstack_control_node03
       roles:
       - infra_kvm
       - openstack_control
       - openstack_database
       - openstack_message_queue
-    #  - features_designate_bind9_database
-    #  - features_designate_bind9
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -61,11 +52,10 @@
         ens4:
           role: single_ctl
 
-    prx01.mcp11-ovs-dpdk.local:
+    prx01.mcp-queens-ovs.local:
       reclass_storage_name: openstack_proxy_node01
       roles:
       - openstack_proxy
-    #  - features_designate_bind9_proxy
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -73,7 +63,7 @@
         ens4:
           role: single_ctl
 
-    mon01.mcp11-ovs-dpdk.local:
+    mon01.mcp-queens-ovs.local:
       reclass_storage_name: stacklight_server_node01
       roles:
       - stacklightv2_server_leader
@@ -84,7 +74,7 @@
         ens4:
           role: single_ctl
 
-    mon02.mcp11-ovs-dpdk.local:
+    mon02.mcp-queens-ovs.local:
       reclass_storage_name: stacklight_server_node02
       roles:
       - stacklightv2_server
@@ -95,7 +85,7 @@
         ens4:
           role: single_ctl
 
-    mon03.mcp11-ovs-dpdk.local:
+    mon03.mcp-queens-ovs.local:
       reclass_storage_name: stacklight_server_node03
       roles:
       - stacklightv2_server
@@ -106,7 +96,7 @@
         ens4:
           role: single_ctl
 
-    log01.mcp11-ovs-dpdk.local:
+    log01.mcp-queens-ovs.local:
       reclass_storage_name: stacklight_log_node01
       roles:
       - stacklight_log_leader_v2
@@ -117,7 +107,7 @@
         ens4:
           role: single_ctl
 
-    log02.mcp11-ovs-dpdk.local:
+    log02.mcp-queens-ovs.local:
       reclass_storage_name: stacklight_log_node02
       roles:
       - stacklight_log
@@ -128,7 +118,7 @@
         ens4:
           role: single_ctl
 
-    log03.mcp11-ovs-dpdk.local:
+    log03.mcp-queens-ovs.local:
       reclass_storage_name: stacklight_log_node03
       roles:
       - stacklight_log
@@ -139,7 +129,7 @@
         ens4:
           role: single_ctl
 
-    mtr01.mcp11-ovs-dpdk.local:
+    mtr01.mcp-queens-ovs.local:
       reclass_storage_name: stacklight_telemetry_node01
       roles:
       - stacklight_telemetry_leader
@@ -150,7 +140,7 @@
         ens4:
           role: single_ctl
 
-    mtr02.mcp11-ovs-dpdk.local:
+    mtr02.mcp-queens-ovs.local:
       reclass_storage_name: stacklight_telemetry_node02
       roles:
       - stacklight_telemetry
@@ -161,7 +151,7 @@
         ens4:
           role: single_ctl
 
-    mtr03.mcp11-ovs-dpdk.local:
+    mtr03.mcp-queens-ovs.local:
       reclass_storage_name: stacklight_telemetry_node03
       roles:
       - stacklight_telemetry
@@ -173,7 +163,7 @@
           role: single_ctl
 
     # Generator-based computes. For compatibility only
-    cmp<<count>>.mcp11-ovs-dpdk.local:
+    cmp<<count>>.mcp-queens-ovs.local:
       reclass_storage_name: openstack_compute_rack01
       roles:
       - openstack_compute
@@ -188,7 +178,7 @@
         ens6:
           role: bond1_ab_ovs_floating
 
-    gtw01.mcp11-ovs-dpdk.local:
+    gtw01.mcp-queens-ovs.local:
       reclass_storage_name: openstack_gateway_node01
       roles:
       - openstack_gateway
@@ -202,3 +192,23 @@
           role: bond0_ab_ovs_vxlan_mesh
         ens6:
           role: bond1_ab_ovs_floating
+
+#    dns01.mcp-queens-dvr.local:
+#      reclass_storage_name: openstack_dns_node01
+#      roles:
+#      - linux_system_codename_xenial
+#      interfaces:
+#        ens3:
+#          role: single_dhcp
+#        ens4:
+#          role: single_ctl
+#
+#    dns02.mcp-queens-dvr.local:
+#      reclass_storage_name: openstack_dns_node02
+#      roles:
+#      - linux_system_codename_xenial
+#      interfaces:
+#        ens3:
+#          role: single_dhcp
+#        ens4:
+#          role: single_ctl
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-mcp-queens-ovs/salt.yaml b/tcp_tests/templates/cookied-mcp-queens-ovs/salt.yaml
index a3f6529..149f0bb 100644
--- a/tcp_tests/templates/cookied-mcp-queens-ovs/salt.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-ovs/salt.yaml
@@ -19,13 +19,6 @@
 
 {{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }}
 
-- description: Start compute node addresses from .105 , as in static models
-  cmd: |
-    sed -i 's/start: 101/start: 105/g' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/infra/config.yml;ml;
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: true
-
 {{ SHARED.MACRO_GENERATE_INVENTORY() }}
 
 {{ SHARED.MACRO_NETWORKING_WORKAROUNDS() }}
diff --git a/tcp_tests/templates/cookied-mcp-queens-ovs/underlay.yaml b/tcp_tests/templates/cookied-mcp-queens-ovs/underlay.yaml
index f7b7d56..c094a31 100644
--- a/tcp_tests/templates/cookied-mcp-queens-ovs/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-ovs/underlay.yaml
@@ -30,6 +30,8 @@
 {% set HOSTNAME_MTR02 = os_env('HOSTNAME_MTR02', 'mtr02.' + DOMAIN_NAME) %}
 {% set HOSTNAME_MTR03 = os_env('HOSTNAME_MTR03', 'mtr03.' + DOMAIN_NAME) %}
 {% set HOSTNAME_GTW01 = os_env('HOSTNAME_GTW01', 'gtw01.' + DOMAIN_NAME) %}
+#{% set HOSTNAME_DNS01 = os_env('HOSTNAME_DNS01', 'dns01.' + DOMAIN_NAME) %}
+#{% set HOSTNAME_DNS02 = os_env('HOSTNAME_DNS02', 'dns02.' + DOMAIN_NAME) %}
 {% set HOSTNAME_PRX01 = os_env('HOSTNAME_PRX01', 'prx01.' + DOMAIN_NAME) %}
 
 template:
@@ -59,6 +61,8 @@
             default_{{ HOSTNAME_MTR02 }}: +87
             default_{{ HOSTNAME_MTR03 }}: +88
             default_{{ HOSTNAME_GTW01 }}: +110
+#            default_{{ HOSTNAME_DNS01 }}: +111
+#            default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
           ip_ranges:
             dhcp: [+90, -10]
@@ -85,6 +89,8 @@
             default_{{ HOSTNAME_MTR02 }}: +87
             default_{{ HOSTNAME_MTR03 }}: +88
             default_{{ HOSTNAME_GTW01 }}: +110
+#            default_{{ HOSTNAME_DNS01 }}: +111
+#            default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
           ip_ranges:
             dhcp: [+90, -10]
@@ -111,6 +117,8 @@
             default_{{ HOSTNAME_MTR02 }}: +87
             default_{{ HOSTNAME_MTR03 }}: +88
             default_{{ HOSTNAME_GTW01 }}: +110
+#            default_{{ HOSTNAME_DNS01 }}: +111
+#            default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
           ip_ranges:
             dhcp: [+10, -10]
@@ -137,6 +145,8 @@
             default_{{ HOSTNAME_MTR02 }}: +87
             default_{{ HOSTNAME_MTR03 }}: +88
             default_{{ HOSTNAME_GTW01 }}: +110
+#            default_{{ HOSTNAME_DNS01 }}: +111
+#            default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
           ip_ranges:
             dhcp: [+130, +220]
@@ -699,3 +709,55 @@
 
               interfaces: *all_interfaces
               network_config: *all_network_config
+
+#          - name: {{ HOSTNAME_DNS01 }}
+#            role: salt_minion
+#            params:
+#              vcpu: !os_env SLAVE_NODE_CPU, 1
+#              memory: !os_env SLAVE_NODE_MEMORY, 2048
+#              boot:
+#                - hd
+#              cloud_init_volume_name: iso
+#              cloud_init_iface_up: ens3
+#              volumes:
+#                - name: system
+#                  capacity: !os_env NODE_VOLUME_SIZE, 150
+#                  backing_store: mcp_ubuntu_1604_image
+#                  format: qcow2
+#                - name: iso  # Volume with name 'iso' will be used
+#                             # for store image with cloud-init metadata.
+#                  capacity: 1
+#                  format: raw
+#                  device: cdrom
+#                  bus: ide
+#                  cloudinit_meta_data: *cloudinit_meta_data
+#                  cloudinit_user_data: *cloudinit_user_data_1604
+#
+#              interfaces: *all_interfaces
+#              network_config: *all_network_config
+#
+#          - name: {{ HOSTNAME_DNS02 }}
+#            role: salt_minion
+#            params:
+#              vcpu: !os_env SLAVE_NODE_CPU, 1
+#              memory: !os_env SLAVE_NODE_MEMORY, 2048
+#              boot:
+#                - hd
+#              cloud_init_volume_name: iso
+#              cloud_init_iface_up: ens3
+#              volumes:
+#                - name: system
+#                  capacity: !os_env NODE_VOLUME_SIZE, 150
+#                  backing_store: mcp_ubuntu_1604_image
+#                  format: qcow2
+#                - name: iso  # Volume with name 'iso' will be used
+#                             # for store image with cloud-init metadata.
+#                  capacity: 1
+#                  format: raw
+#                  device: cdrom
+#                  bus: ide
+#                  cloudinit_meta_data: *cloudinit_meta_data
+#                  cloudinit_user_data: *cloudinit_user_data_1604
+#
+#              interfaces: *all_interfaces
+#              network_config: *all_network_config