diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml
index 70ec427..ed3961a 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml
@@ -189,16 +189,14 @@
   manila_share_backend: 'lvm'
   manila_lvm_volume_name: 'manila-volume'
   manila_lvm_devices: '/dev/loop0'
-  openstack_share_address: 172.16.10.68
-  openstack_share_node01_address: 172.16.10.69
-  openstack_share_node02_address: 172.16.10.70
-  openstack_share_node03_address: 172.16.10.71
-  openstack_share_node01_deploy_address: 192.168.10.69
-  openstack_share_node02_deploy_address: 192.168.10.70
-  openstack_share_node03_deploy_address: 192.168.10.71
+  openstack_share_address: 172.16.10.203
+  openstack_share_node01_address: 172.16.10.204
+  openstack_share_node02_address: 172.16.10.205
+  openstack_share_node03_address: 172.16.10.206
+  openstack_share_node01_deploy_address: 192.168.10.204
+  openstack_share_node02_deploy_address: 192.168.10.205
+  openstack_share_node03_deploy_address: 192.168.10.206
   openstack_share_hostname: share
   openstack_share_node01_hostname: share01
   openstack_share_node02_hostname: share02
   openstack_share_node03_hostname: share03
-  designate_backend: bind
-  designate_enabled: 'True'
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr/underlay.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr/underlay.yaml
index 3044dd9..c924e4c 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr/underlay.yaml
@@ -67,9 +67,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+90, -10]
 
@@ -98,9 +98,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+90, -10]
 
@@ -129,9 +129,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+10, -10]
 
@@ -160,9 +160,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+10, -10]
 
diff --git a/tcp_tests/templates/cookied-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml b/tcp_tests/templates/cookied-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml
index 907fd63..08f4a16 100644
--- a/tcp_tests/templates/cookied-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml
@@ -189,16 +189,14 @@
   manila_share_backend: 'lvm'
   manila_lvm_volume_name: 'manila-volume'
   manila_lvm_devices: '/dev/loop0'
-  openstack_share_address: 172.16.10.68
-  openstack_share_node01_address: 172.16.10.69
-  openstack_share_node02_address: 172.16.10.70
-  openstack_share_node03_address: 172.16.10.71
-  openstack_share_node01_deploy_address: 192.168.10.69
-  openstack_share_node02_deploy_address: 192.168.10.70
-  openstack_share_node03_deploy_address: 192.168.10.71
+  openstack_share_address: 172.16.10.203
+  openstack_share_node01_address: 172.16.10.204
+  openstack_share_node02_address: 172.16.10.205
+  openstack_share_node03_address: 172.16.10.206
+  openstack_share_node01_deploy_address: 192.168.10.204
+  openstack_share_node02_deploy_address: 192.168.10.205
+  openstack_share_node03_deploy_address: 192.168.10.206
   openstack_share_hostname: share
   openstack_share_node01_hostname: share01
   openstack_share_node02_hostname: share02
   openstack_share_node03_hostname: share03
-  designate_backend: powerdns
-  designate_enabled: 'True'
diff --git a/tcp_tests/templates/cookied-mcp-pike-ovs/underlay.yaml b/tcp_tests/templates/cookied-mcp-pike-ovs/underlay.yaml
index 8feb266..1a6975b 100644
--- a/tcp_tests/templates/cookied-mcp-pike-ovs/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-ovs/underlay.yaml
@@ -67,9 +67,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+90, -10]
 
@@ -98,9 +98,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+90, -10]
 
@@ -129,9 +129,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+10, -10]
 
@@ -160,9 +160,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+10, -10]
 
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
index f45c90b..2bef3b7 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
@@ -210,14 +210,14 @@
   manila_share_backend: 'lvm'
   manila_lvm_volume_name: 'manila-volume'
   manila_lvm_devices: '/dev/loop0'
-  openstack_share_address: 172.16.10.68
-  openstack_share_node01_address: 172.16.10.69
-  openstack_share_node02_address: 172.16.10.70
-  openstack_share_node03_address: 172.16.10.71
-  openstack_share_node01_deploy_address: 192.168.10.69
-  openstack_share_node02_deploy_address: 192.168.10.70
-  openstack_share_node03_deploy_address: 192.168.10.71
+  openstack_share_address: 172.16.10.203
+  openstack_share_node01_address: 172.16.10.204
+  openstack_share_node02_address: 172.16.10.205
+  openstack_share_node03_address: 172.16.10.206
+  openstack_share_node01_deploy_address: 192.168.10.204
+  openstack_share_node02_deploy_address: 192.168.10.205
+  openstack_share_node03_deploy_address: 192.168.10.206
   openstack_share_hostname: share
   openstack_share_node01_hostname: share01
   openstack_share_node02_hostname: share02
-  openstack_share_node03_hostname: share03
\ No newline at end of file
+  openstack_share_node03_hostname: share03
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay.yaml
index a1898ab..a53fbec 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay.yaml
@@ -63,9 +63,9 @@
             default_{{ HOSTNAME_MTR03 }}: +88
             default_{{ HOSTNAME_GTW01 }}: +110
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+90, -10]
 
@@ -92,9 +92,9 @@
             default_{{ HOSTNAME_MTR03 }}: +88
             default_{{ HOSTNAME_GTW01 }}: +110
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+90, -10]
 
@@ -121,9 +121,9 @@
             default_{{ HOSTNAME_MTR03 }}: +88
             default_{{ HOSTNAME_GTW01 }}: +110
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+10, -10]
 
@@ -150,9 +150,9 @@
             default_{{ HOSTNAME_MTR03 }}: +88
             default_{{ HOSTNAME_GTW01 }}: +110
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+130, +220]
 
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
index 2ee8a39..c24202b 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
@@ -209,14 +209,14 @@
   manila_share_backend: 'lvm'
   manila_lvm_volume_name: 'manila-volume'
   manila_lvm_devices: '/dev/loop0'
-  openstack_share_address: 172.16.10.68
-  openstack_share_node01_address: 172.16.10.69
-  openstack_share_node02_address: 172.16.10.70
-  openstack_share_node03_address: 172.16.10.71
-  openstack_share_node01_deploy_address: 192.168.10.69
-  openstack_share_node02_deploy_address: 192.168.10.70
-  openstack_share_node03_deploy_address: 192.168.10.71
+  openstack_share_address: 172.16.10.203
+  openstack_share_node01_address: 172.16.10.204
+  openstack_share_node02_address: 172.16.10.205
+  openstack_share_node03_address: 172.16.10.206
+  openstack_share_node01_deploy_address: 192.168.10.204
+  openstack_share_node02_deploy_address: 192.168.10.205
+  openstack_share_node03_deploy_address: 192.168.10.206
   openstack_share_hostname: share
   openstack_share_node01_hostname: share01
   openstack_share_node02_hostname: share02
-  openstack_share_node03_hostname: share03
\ No newline at end of file
+  openstack_share_node03_hostname: share03
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/underlay.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/underlay.yaml
index 9e9eb16..1fcba16 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/underlay.yaml
@@ -67,9 +67,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+90, -10]
 
@@ -98,9 +98,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+90, -10]
 
@@ -129,9 +129,9 @@
             default_{{ HOSTNAME_PRX01 }}: +121
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+10, -10]
 
@@ -160,9 +160,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+130, +220]
 
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 fb28baa..0542a9b 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
@@ -209,13 +209,13 @@
   manila_share_backend: 'lvm'
   manila_lvm_volume_name: 'manila-volume'
   manila_lvm_devices: '/dev/loop0'
-  openstack_share_address: 172.16.10.68
-  openstack_share_node01_address: 172.16.10.69
-  openstack_share_node02_address: 172.16.10.70
-  openstack_share_node03_address: 172.16.10.71
-  openstack_share_node01_deploy_address: 192.168.10.69
-  openstack_share_node02_deploy_address: 192.168.10.70
-  openstack_share_node03_deploy_address: 192.168.10.71
+  openstack_share_address: 172.16.10.203
+  openstack_share_node01_address: 172.16.10.204
+  openstack_share_node02_address: 172.16.10.205
+  openstack_share_node03_address: 172.16.10.206
+  openstack_share_node01_deploy_address: 192.168.10.204
+  openstack_share_node02_deploy_address: 192.168.10.205
+  openstack_share_node03_deploy_address: 192.168.10.206
   openstack_share_hostname: share
   openstack_share_node01_hostname: share01
   openstack_share_node02_hostname: share02
diff --git a/tcp_tests/templates/cookied-mcp-queens-ovs/underlay.yaml b/tcp_tests/templates/cookied-mcp-queens-ovs/underlay.yaml
index b44c157..390814a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-ovs/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-ovs/underlay.yaml
@@ -66,9 +66,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+90, -10]
 
@@ -97,9 +97,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+90, -10]
 
@@ -128,9 +128,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+10, -10]
 
@@ -159,9 +159,9 @@
             default_{{ HOSTNAME_DNS01 }}: +111
             default_{{ HOSTNAME_DNS02 }}: +112
             default_{{ HOSTNAME_PRX01 }}: +121
-            default_{{ HOSTNAME_SHARE01 }}: +69
-            default_{{ HOSTNAME_SHARE02 }}: +70
-            default_{{ HOSTNAME_SHARE03 }}: +71
+            default_{{ HOSTNAME_SHARE01 }}: +204
+            default_{{ HOSTNAME_SHARE02 }}: +205
+            default_{{ HOSTNAME_SHARE03 }}: +206
           ip_ranges:
             dhcp: [+130, +220]