diff --git a/tcp_tests/helpers/utils.py b/tcp_tests/helpers/utils.py
index 9501e01..001cf3e 100644
--- a/tcp_tests/helpers/utils.py
+++ b/tcp_tests/helpers/utils.py
@@ -330,7 +330,7 @@
         if default is None:
             required_env_vars.add(var_name)
         else:
-            optional_env_vars[var_name] = default
+            optional_env_vars[var_name] = var
 
         return var
 
@@ -352,7 +352,7 @@
     if optional_env_vars:
         LOG.info("Optional environment variables:")
         for var, default in sorted(optional_env_vars.iteritems()):
-            LOG.info("    {0} , default value = {1}".format(var, default))
+            LOG.info("    {0} , value = {1}".format(var, default))
     return template
 
 
diff --git a/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml b/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
index 26786d9..5912f7d 100644
--- a/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
+++ b/tcp_tests/templates/physical_mcp11_ovs_dpdk/underlay.yaml
@@ -77,7 +77,7 @@
 
               root_volume_name: system     # see 'volumes' below
               cloud_init_volume_name: iso  # see 'volumes' below
-              cloud_init_iface_up: enp3s0f0  # see 'interfaces' below.
+              cloud_init_iface_up: enp3s0f1  # see 'interfaces' below.
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 200