diff --git a/ci/schemas/one_node_wheezy/nodes.conf b/ci/schemas/one_node_wheezy/nodes.conf
index 861e4d2850c9f2ac3f2e4619570d6015148a6535..1a55e2c7457e04b4259c8ba534eae1c6b85873ce 100644
--- a/ci/schemas/one_node_wheezy/nodes.conf
+++ b/ci/schemas/one_node_wheezy/nodes.conf
@@ -27,9 +27,9 @@ password =
 # The interface with internet access
 public_iface = eth0
 # The interface for the instances' public traffic
-vm_public_iface = eth1
+vm_public_iface =
 # The interface for the instances' private traffic
-vm_private_iface = eth2
+vm_private_iface =
 
 # The extra disk for the Ganeti VG needed for plain and drbd disk templates
 extra_disk = /dev/vdb
@@ -42,5 +42,3 @@ extra_disk = /dev/vdb
 name = node
 ip = 192.0.2.1
 extra_disk =
-vm_public_iface = dummy
-vm_private_iface = dummy
diff --git a/snf-deploy/conf/nodes.conf b/snf-deploy/conf/nodes.conf
index 240e909f2c4a05402b35dad2477e453eda426814..a6b81ad7dc76acc83c97407582f563d4bf7c6cd3 100644
--- a/snf-deploy/conf/nodes.conf
+++ b/snf-deploy/conf/nodes.conf
@@ -27,9 +27,9 @@ password =
 # The interface with internet access
 public_iface = eth0
 # The interface for the instances' public traffic
-vm_public_iface = eth1
+vm_public_iface =
 # The interface for the instances' private traffic
-vm_private_iface = eth2
+vm_private_iface =
 
 # The extra disk for the Ganeti VG needed for plain and drbd disk templates
 extra_disk = /dev/vdb
diff --git a/snf-deploy/files/etc/ferm/masq.ferm b/snf-deploy/files/etc/ferm/masq.ferm
index 135361e961c1e01ebc81c5d68773024a8a4ff969..02a7eec86a8d0de1e642ef067018cce191c6cd94 100644
--- a/snf-deploy/files/etc/ferm/masq.ferm
+++ b/snf-deploy/files/etc/ferm/masq.ferm
@@ -2,9 +2,9 @@
 @hook flush "echo 0 > /proc/sys/net/ipv4/ip_forward";
 
 @def $PUBLIC_IFACE = %PUBLIC_IFACE%;
-@def $IFACE = %IFACE%;
+@def $VM_PUBLIC_IFACE = %VM_PUBLIC_IFACE%;
 @def $SUBNET = %SUBNET%;
-@def $MAC = `cat /sys/class/net/%IFACE%/address`;
+@def $MAC = `cat /sys/class/net/%VM_PUBLIC_IFACE%/address`;
 @def $ROUTER = %ROUTER%;
 
 
@@ -21,7 +21,7 @@ domain eb {
   table nat {
       chain POSTROUTING {
          # MAC SNAT for networks
-          outerface $IFACE snat to-source $MAC;
+          outerface $VM_PUBLIC_IFACE snat to-source $MAC;
       }
   }
 }
diff --git a/snf-deploy/files/etc/network/interfaces.synnefo b/snf-deploy/files/etc/network/interfaces.synnefo
index cf6fad65273bb1fe208ce2b3ea3f9077e157cb0e..737b6fbb4240df730c7faffd4d4a221e236edf42 100644
--- a/snf-deploy/files/etc/network/interfaces.synnefo
+++ b/snf-deploy/files/etc/network/interfaces.synnefo
@@ -1,7 +1,4 @@
-# interface and bridge used for VMs' public network
-auto %VM_PUBLIC_IFACE%
-iface %VM_PUBLIC_IFACE% inet manual
-
+# bridge used for VMs' public network
 auto %VM_PUBLIC_BRIDGE%
 iface %VM_PUBLIC_BRIDGE% inet static
     bridge_ports %VM_PUBLIC_IFACE%
@@ -11,10 +8,7 @@ iface %VM_PUBLIC_BRIDGE% inet static
     bridge_waitport 0
     bridge_fd 0
 
-# interface and bridge used for VMs' private networks (MAC_FILTERED)
-auto %VM_PRIVATE_IFACE%
-iface %VM_PRIVATE_IFACE% inet manual
-
+# bridge used for VMs' private networks (MAC_FILTERED)
 auto %VM_PRIVATE_BRIDGE%
 iface %VM_PRIVATE_BRIDGE% inet manual
     bridge_ports %VM_PRIVATE_IFACE%
diff --git a/snf-deploy/snfdeploy/components.py b/snf-deploy/snfdeploy/components.py
index 95f8871a1629d6267fd1f2579315bedca30bd333..81ae21e965df2142b5313d9751c8d5d65744a66f 100644
--- a/snf-deploy/snfdeploy/components.py
+++ b/snf-deploy/snfdeploy/components.py
@@ -876,17 +876,20 @@ class Network(base.Component):
             "subnet": config.synnefo_public_network_subnet,
             "gateway": config.synnefo_public_network_gateway,
             "router": 1 if is_router else 0,
-            "iface": self.node.vm_public_iface,
+            "vm_public_iface": self.node.vm_public_iface
+                if self.node.vm_public_iface else self.node.public_iface,
             }
         r5 = {
             "vm_public_bridge": config.vm_public_bridge,
-            "vm_public_iface": self.node.vm_public_iface,
+            "vm_public_iface": self.node.vm_public_iface
+                if self.node.vm_public_iface else "none",
             "address": config.synnefo_public_network_gateway \
                 if is_router else "0.0.0.0",
             "netmask": config.synnefo_public_network_netmask \
                 if is_router else "255.255.255.255",
             "vm_private_bridge": config.vm_private_bridge,
-            "vm_private_iface": self.node.vm_private_iface,
+            "vm_private_iface": self.node.vm_private_iface
+                if self.node.vm_private_iface else "none",
             }
 
         return [