diff --git a/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-environment.yaml b/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-environment.yaml
index fd2730d..6707515 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-environment.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-environment.yaml
@@ -17,9 +17,9 @@
       - openstack_control_leader
       - openstack_database_leader
       - openstack_message_queue
-      - features_designate_database
-      - features_designate
-      - features_designate_keystone
+      - features_designate_pool_manager_database
+      - features_designate_pool_manager
+      - features_designate_pool_manager_keystone
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -34,8 +34,8 @@
       - openstack_control
       - openstack_database
       - openstack_message_queue
-      - features_designate_database
-      - features_designate
+      - features_designate_pool_manager_database
+      - features_designate_pool_manager
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -50,8 +50,8 @@
       - openstack_control
       - openstack_database
       - openstack_message_queue
-      - features_designate_database
-      - features_designate
+      - features_designate_pool_manager_database
+      - features_designate_pool_manager
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -143,7 +143,7 @@
     dns01.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_dns_node01
       roles:
-      - openstack_dns
+      - features_designate_pool_manager_dns
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -154,7 +154,7 @@
     dns02.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_dns_node02
       roles:
-      - openstack_dns
+      - features_designate_pool_manager_dns
       - linux_system_codename_xenial
       interfaces:
         ens3:
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr/_context-environment.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr/_context-environment.yaml
index fd2730d..6707515 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr/_context-environment.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr/_context-environment.yaml
@@ -17,9 +17,9 @@
       - openstack_control_leader
       - openstack_database_leader
       - openstack_message_queue
-      - features_designate_database
-      - features_designate
-      - features_designate_keystone
+      - features_designate_pool_manager_database
+      - features_designate_pool_manager
+      - features_designate_pool_manager_keystone
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -34,8 +34,8 @@
       - openstack_control
       - openstack_database
       - openstack_message_queue
-      - features_designate_database
-      - features_designate
+      - features_designate_pool_manager_database
+      - features_designate_pool_manager
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -50,8 +50,8 @@
       - openstack_control
       - openstack_database
       - openstack_message_queue
-      - features_designate_database
-      - features_designate
+      - features_designate_pool_manager_database
+      - features_designate_pool_manager
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -143,7 +143,7 @@
     dns01.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_dns_node01
       roles:
-      - openstack_dns
+      - features_designate_pool_manager_dns
       - linux_system_codename_xenial
       interfaces:
         ens3:
@@ -154,7 +154,7 @@
     dns02.mcp11-ovs-dpdk.local:
       reclass_storage_name: openstack_dns_node02
       roles:
-      - openstack_dns
+      - features_designate_pool_manager_dns
       - linux_system_codename_xenial
       interfaces:
         ens3: