diff --git a/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay.yaml b/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay.yaml
index 8e57462..98e5a56 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay.yaml
@@ -160,7 +160,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -172,7 +172,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/mcp-ocata-local-repo-dvr/underlay.yaml b/tcp_tests/templates/mcp-ocata-local-repo-dvr/underlay.yaml
index dbe05d6..d2d4778 100644
--- a/tcp_tests/templates/mcp-ocata-local-repo-dvr/underlay.yaml
+++ b/tcp_tests/templates/mcp-ocata-local-repo-dvr/underlay.yaml
@@ -126,7 +126,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -136,7 +136,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp-mitaka-dvr/underlay.yaml b/tcp_tests/templates/virtual-mcp-mitaka-dvr/underlay.yaml
index dca9953..714cd1b 100644
--- a/tcp_tests/templates/virtual-mcp-mitaka-dvr/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-mitaka-dvr/underlay.yaml
@@ -144,7 +144,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -156,7 +156,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ceph-offline/underlay.yaml b/tcp_tests/templates/virtual-mcp-ocata-ceph-offline/underlay.yaml
index c32f875..49445ae 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ceph-offline/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ceph-offline/underlay.yaml
@@ -147,7 +147,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -159,7 +159,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay.yaml b/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay.yaml
index 03777ac..b9e03aa 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay.yaml
@@ -144,7 +144,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -156,7 +156,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/underlay.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/underlay.yaml
index 98cf85a..c7aecc5 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/underlay.yaml
@@ -144,7 +144,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -156,7 +156,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay.yaml
index 7e2a8a4..895ee4a 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay.yaml
@@ -134,7 +134,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -146,7 +146,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/underlay.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/underlay.yaml
index f5592b2..483940e 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/underlay.yaml
@@ -159,7 +159,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -171,7 +171,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/underlay.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/underlay.yaml
index d8a81d3..d479f1c 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/underlay.yaml
@@ -134,7 +134,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -146,7 +146,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr/underlay.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr/underlay.yaml
index eebc07f..c198901 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr/underlay.yaml
@@ -129,7 +129,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -141,7 +141,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp-pike-ovs-ceph/underlay.yaml b/tcp_tests/templates/virtual-mcp-pike-ovs-ceph/underlay.yaml
index 77e33a2..44559f9 100644
--- a/tcp_tests/templates/virtual-mcp-pike-ovs-ceph/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-ovs-ceph/underlay.yaml
@@ -144,7 +144,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -156,7 +156,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp-pike-ovs/underlay.yaml b/tcp_tests/templates/virtual-mcp-pike-ovs/underlay.yaml
index eb0e1a5..8c45b68 100644
--- a/tcp_tests/templates/virtual-mcp-pike-ovs/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-ovs/underlay.yaml
@@ -139,7 +139,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -151,7 +151,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp-sl-os/underlay.yaml b/tcp_tests/templates/virtual-mcp-sl-os/underlay.yaml
index cf74d86..4b4ce8e 100644
--- a/tcp_tests/templates/virtual-mcp-sl-os/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-sl-os/underlay.yaml
@@ -134,7 +134,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -146,7 +146,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml b/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml
index 5ee6958..eb64cf1 100644
--- a/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml
@@ -136,7 +136,9 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
+            forward:
+              mode: route
 
           admin:
             address_pool: admin-pool01
@@ -146,7 +148,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp10-dvr/underlay.yaml b/tcp_tests/templates/virtual-mcp10-dvr/underlay.yaml
index a308d72..e163d23 100644
--- a/tcp_tests/templates/virtual-mcp10-dvr/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp10-dvr/underlay.yaml
@@ -110,7 +110,9 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
+            forward:
+              mode: route
 
           admin:
             address_pool: admin-pool01
@@ -120,7 +122,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp10-ovs.new/underlay.yaml b/tcp_tests/templates/virtual-mcp10-ovs.new/underlay.yaml
index 528a0bf..0a6b9f4 100644
--- a/tcp_tests/templates/virtual-mcp10-ovs.new/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp10-ovs.new/underlay.yaml
@@ -110,7 +110,9 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
+            forward:
+              mode: route
 
           admin:
             address_pool: admin-pool01
@@ -120,7 +122,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp10-ovs/underlay.yaml b/tcp_tests/templates/virtual-mcp10-ovs/underlay.yaml
index 528a0bf..0a6b9f4 100644
--- a/tcp_tests/templates/virtual-mcp10-ovs/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp10-ovs/underlay.yaml
@@ -110,7 +110,9 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
+            forward:
+              mode: route
 
           admin:
             address_pool: admin-pool01
@@ -120,7 +122,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp11-dvr/underlay.yaml b/tcp_tests/templates/virtual-mcp11-dvr/underlay.yaml
index 50d16e0..7a37142 100644
--- a/tcp_tests/templates/virtual-mcp11-dvr/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp11-dvr/underlay.yaml
@@ -119,7 +119,9 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
+            forward:
+              mode: route
 
           admin:
             address_pool: admin-pool01
@@ -129,7 +131,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay.yaml b/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay.yaml
index 888786e..c396bcd 100644
--- a/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp11-ovs-dpdk/underlay.yaml
@@ -120,7 +120,9 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
+            forward:
+              mode: route
 
           admin:
             address_pool: admin-pool01
@@ -130,7 +132,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp11-ovs.new/underlay.yaml b/tcp_tests/templates/virtual-mcp11-ovs.new/underlay.yaml
index 68c09ae..40ea763 100644
--- a/tcp_tests/templates/virtual-mcp11-ovs.new/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp11-ovs.new/underlay.yaml
@@ -119,7 +119,9 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
+            forward:
+              mode: route
 
           admin:
             address_pool: admin-pool01
@@ -129,7 +131,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-mcp11-ovs/underlay.yaml b/tcp_tests/templates/virtual-mcp11-ovs/underlay.yaml
index 1291dae..bd52ae0 100644
--- a/tcp_tests/templates/virtual-mcp11-ovs/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp11-ovs/underlay.yaml
@@ -119,7 +119,9 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
+            forward:
+              mode: route
 
           admin:
             address_pool: admin-pool01
@@ -129,7 +131,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-offline-pike-ovs/underlay.yaml b/tcp_tests/templates/virtual-offline-pike-ovs/underlay.yaml
index 0823cb4..e473292 100644
--- a/tcp_tests/templates/virtual-offline-pike-ovs/underlay.yaml
+++ b/tcp_tests/templates/virtual-offline-pike-ovs/underlay.yaml
@@ -122,7 +122,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -134,7 +134,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01
diff --git a/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay.yaml b/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay.yaml
index d82c380..a5673e2 100644
--- a/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay.yaml
+++ b/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay.yaml
@@ -160,7 +160,7 @@
         l2_network_devices:
           private:
             address_pool: private-pool01
-            dhcp: true
+            dhcp: false
             forward:
               mode: route
 
@@ -172,7 +172,7 @@
 
           tenant:
             address_pool: tenant-pool01
-            dhcp: true
+            dhcp: false
 
           external:
             address_pool: external-pool01