diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/underlay.hot b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/underlay.hot
index da17023..335aa50 100644
--- a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/underlay.hot
@@ -42,10 +42,10 @@
     default: 172.16.180.1
   management_subnet_pool_start:
     type: string
-    default: 172.16.180.3
+    default: 172.16.181.252
   management_subnet_pool_end:
     type: string
-    default: 172.16.180.61
+    default: 172.16.181.254
   salt_master_control_ip:
     type: string
     default: 10.167.11.5
diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
index f40da29..b16d5a5 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
@@ -42,10 +42,10 @@
     default: 172.16.180.1
   management_subnet_pool_start:
     type: string
-    default: 172.16.180.3
+    default: 172.16.181.252
   management_subnet_pool_end:
     type: string
-    default: 172.16.180.61
+    default: 172.16.181.254
   salt_master_control_ip:
     type: string
     default: 10.167.11.5
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/underlay.hot b/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/underlay.hot
index 5678cf9..fd850ac 100755
--- a/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/underlay.hot
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/underlay.hot
@@ -42,10 +42,10 @@
     default: 172.16.180.1
   management_subnet_pool_start:
     type: string
-    default: 172.16.180.3
+    default: 172.16.181.252
   management_subnet_pool_end:
     type: string
-    default: 172.16.180.61
+    default: 172.16.181.254
   salt_master_control_ip:
     type: string
     default: 10.167.11.5
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
index 4306ae5..3b2e389 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
@@ -42,10 +42,10 @@
     default: 172.16.180.1
   management_subnet_pool_start:
     type: string
-    default: 172.16.180.3
+    default: 172.16.181.252
   management_subnet_pool_end:
     type: string
-    default: 172.16.180.61
+    default: 172.16.181.254
   salt_master_control_ip:
     type: string
     default: 10.167.11.5
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot
index 8b01d59..d4cf5be 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot
@@ -44,10 +44,10 @@
     default: 172.16.180.1
   management_subnet_pool_start:
     type: string
-    default: 172.16.180.3
+    default: 172.16.181.252
   management_subnet_pool_end:
     type: string
-    default: 172.16.180.61
+    default: 172.16.181.254
   salt_master_control_ip:
     type: string
     default: 10.6.0.15
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
index 8bc2a84..d01628d 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
@@ -44,10 +44,10 @@
     default: 172.16.180.1
   management_subnet_pool_start:
     type: string
-    default: 172.16.180.3
+    default: 172.16.181.252
   management_subnet_pool_end:
     type: string
-    default: 172.16.180.61
+    default: 172.16.181.254
   salt_master_control_ip:
     type: string
     default: 10.6.0.15
diff --git a/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/underlay.hot b/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/underlay.hot
index f2ce3f0..f9a140f 100644
--- a/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/underlay.hot
@@ -42,10 +42,10 @@
     default: 172.16.180.1
   management_subnet_pool_start:
     type: string
-    default: 172.16.180.3
+    default: 172.16.181.252
   management_subnet_pool_end:
     type: string
-    default: 172.16.180.61
+    default: 172.16.181.254
   salt_master_control_ip:
     type: string
     default: 10.167.11.5
diff --git a/tcp_tests/templates/released-bm-cicd-queens-ovs-cl-maas/underlay.hot b/tcp_tests/templates/released-bm-cicd-queens-ovs-cl-maas/underlay.hot
index da369fb..4c53f90 100644
--- a/tcp_tests/templates/released-bm-cicd-queens-ovs-cl-maas/underlay.hot
+++ b/tcp_tests/templates/released-bm-cicd-queens-ovs-cl-maas/underlay.hot
@@ -42,10 +42,10 @@
     default: 172.16.180.1
   management_subnet_pool_start:
     type: string
-    default: 172.16.180.3
+    default: 172.16.181.252
   management_subnet_pool_end:
     type: string
-    default: 172.16.180.61
+    default: 172.16.181.254
   salt_master_control_ip:
     type: string
     default: 10.167.11.5