diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 3355d16..335b2d0 100644
--- a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -518,7 +518,7 @@
   openstack_barbican_node02_hostname: kmn02
   openstack_barbican_node03_address: 10.167.11.47
   openstack_barbican_node03_hostname: kmn03
-  openstack_create_public_network: 'False'
+  openstack_create_public_network: 'True'
   openstack_public_neutron_subnet_gateway: 172.17.42.1
   openstack_public_neutron_subnet_cidr: 172.17.42.0/26
   openstack_public_neutron_subnet_allocation_start: 172.17.42.15
diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
index 768df20..c4fae7b 100644
--- a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
@@ -4,6 +4,7 @@
       roles:
       - infra_config
       - linux_system_codename_xenial
+      - features_runtest
       interfaces:
         ens3:
           role: single_static_mgm
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
index dcf4654..d42f93f 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
@@ -159,7 +159,6 @@
   mcp_common_scripts_branch: 'proposed'
   mcp_version: proposed
   no_platform: 'False'
-  nova_vnc_tls_enabled: 'True'
   offline_deployment: 'False'
   opencontrail_enabled: 'False'
   openldap_domain: ${_param:cluster_name}.local
@@ -295,7 +294,7 @@
   rabbitmq_ssl_enabled: 'True'
   openstack_rabbitmq_x509_enabled: 'True'
   openstack_internal_protocol: 'https'
-  openstack_create_public_network: 'False'
+  openstack_create_public_network: 'True'
   openstack_public_neutron_subnet_gateway: 172.17.16.1
   openstack_public_neutron_subnet_cidr: 172.17.16.0/24
   openstack_public_neutron_subnet_allocation_start: 172.17.16.201
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/environment_context.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/environment_context.yaml
index 339956e..f396f3e 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/environment_context.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/environment_context.yaml
@@ -4,6 +4,7 @@
       roles:
       - infra_config
       - linux_system_codename_xenial
+      - features_runtest
       classes:
       - environment.cookied-cicd-pike-dvr-ceph.override_ntp_virtual
       interfaces:
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml
index 343a4e6..56f3646 100644
--- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml
+++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml
@@ -266,7 +266,7 @@
   octavia_lb_mgmt_cidr: 192.168.1.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
   octavia_lb_mgmt_allocation_pool_end: 192.168.1.200
-  openstack_create_public_network: 'False'
+  openstack_create_public_network: 'True'
   openstack_public_neutron_subnet_gateway: 172.17.16.1
   openstack_public_neutron_subnet_cidr: 172.17.16.0/24
   openstack_public_neutron_subnet_allocation_start: 172.17.16.201
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
index 9b325ae..97e8520 100644
--- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
+++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
@@ -4,6 +4,7 @@
       roles:
       - infra_config
       - linux_system_codename_xenial
+      - features_runtest
       classes:
       - environment.cookied-cicd-queens-dvr-sl.override_ntp_virtual
       interfaces: