diff --git a/tcp_tests/templates/cookied-mcp-mitaka-dvr/underlay.yaml b/tcp_tests/templates/cookied-mcp-mitaka-dvr/underlay.yaml
index 08f443e..7225c6d 100644
--- a/tcp_tests/templates/cookied-mcp-mitaka-dvr/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-mitaka-dvr/underlay.yaml
@@ -162,7 +162,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
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 d2d4778..9f2ce17 100644
--- a/tcp_tests/templates/mcp-ocata-local-repo-dvr/underlay.yaml
+++ b/tcp_tests/templates/mcp-ocata-local-repo-dvr/underlay.yaml
@@ -142,7 +142,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
         group_volumes:
          - name: cloudimage1604    # This name is used for 'backing_store' option for node volumes.
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 49445ae..1fd9b17 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ceph-offline/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ceph-offline/underlay.yaml
@@ -165,7 +165,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
         group_volumes:
          - name: cloudimage1604    # This name is used for 'backing_store' option for node volumes.
diff --git a/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay.yaml b/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay.yaml
index b9e03aa..de5427a 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-dvr/underlay.yaml
@@ -162,7 +162,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
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 c7aecc5..75fffe4 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs-ceph/underlay.yaml
@@ -162,7 +162,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay.yaml
index 895ee4a..382dba4 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs/underlay.yaml
@@ -152,7 +152,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
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 483940e..08c87ef 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
@@ -177,7 +177,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/underlay.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/underlay.yaml
index 5db14e1..60aa2c8 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/underlay.yaml
@@ -152,7 +152,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
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 380ac59..aaf67ba 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/underlay.yaml
@@ -152,7 +152,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr/underlay.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr/underlay.yaml
index 8d6a20d..e1914b4 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr/underlay.yaml
@@ -152,7 +152,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
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 44559f9..1ce697b 100644
--- a/tcp_tests/templates/virtual-mcp-pike-ovs-ceph/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-ovs-ceph/underlay.yaml
@@ -162,7 +162,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
diff --git a/tcp_tests/templates/virtual-mcp-pike-ovs-l2gw-bgpvpn/underlay.yaml b/tcp_tests/templates/virtual-mcp-pike-ovs-l2gw-bgpvpn/underlay.yaml
index 2ea28a8..578c2ad 100644
--- a/tcp_tests/templates/virtual-mcp-pike-ovs-l2gw-bgpvpn/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-ovs-l2gw-bgpvpn/underlay.yaml
@@ -158,7 +158,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
diff --git a/tcp_tests/templates/virtual-mcp-pike-ovs/underlay.yaml b/tcp_tests/templates/virtual-mcp-pike-ovs/underlay.yaml
index 8c45b68..816f9b1 100644
--- a/tcp_tests/templates/virtual-mcp-pike-ovs/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-ovs/underlay.yaml
@@ -157,7 +157,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
diff --git a/tcp_tests/templates/virtual-mcp-sl-os/underlay.yaml b/tcp_tests/templates/virtual-mcp-sl-os/underlay.yaml
index 4b4ce8e..c2f7bd1 100644
--- a/tcp_tests/templates/virtual-mcp-sl-os/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp-sl-os/underlay.yaml
@@ -152,7 +152,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
diff --git a/tcp_tests/templates/virtual-mcp11-dvr/underlay.yaml b/tcp_tests/templates/virtual-mcp11-dvr/underlay.yaml
index 7a37142..51f1b64 100644
--- a/tcp_tests/templates/virtual-mcp11-dvr/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp11-dvr/underlay.yaml
@@ -137,7 +137,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
diff --git a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay.yaml b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay.yaml
index 54f48f4..dabe708 100644
--- a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay.yaml
+++ b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay.yaml
@@ -143,7 +143,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
         group_volumes:
          - name: cloudimage1604    # This name is used for 'backing_store' option for node volumes.
diff --git a/tcp_tests/templates/virtual-offline-pike-ovs/underlay.yaml b/tcp_tests/templates/virtual-offline-pike-ovs/underlay.yaml
index e473292..569a96c 100644
--- a/tcp_tests/templates/virtual-offline-pike-ovs/underlay.yaml
+++ b/tcp_tests/templates/virtual-offline-pike-ovs/underlay.yaml
@@ -140,7 +140,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
         group_volumes:
          - name: cloudimage1604    # This name is used for 'backing_store' option for node volumes.
diff --git a/tcp_tests/templates/virtual-offline-ssl/underlay.yaml b/tcp_tests/templates/virtual-offline-ssl/underlay.yaml
index 47b1c57..18c2bf1 100644
--- a/tcp_tests/templates/virtual-offline-ssl/underlay.yaml
+++ b/tcp_tests/templates/virtual-offline-ssl/underlay.yaml
@@ -160,7 +160,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes:
diff --git a/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay.yaml b/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay.yaml
index a5673e2..25cfbc4 100644
--- a/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay.yaml
+++ b/tcp_tests/templates/virtual-pike-ovs-dpdk/underlay.yaml
@@ -178,7 +178,7 @@
             address_pool: external-pool01
             dhcp: true
             forward:
-              mode: nat
+              mode: route
 
 
         group_volumes: