diff --git a/iopsys-brcm63xx-arm/base-files/etc/uci-defaults/20-layer2-config-generate b/iopsys-brcm63xx-arm/base-files/etc/uci-defaults/20-layer2-config-generate
index 5fd81e2d2e3435db524cc7da519a5ff21936ef3b..3e77f99fa2efe28e5e6a64e7ce609c50067dceaa 100644
--- a/iopsys-brcm63xx-arm/base-files/etc/uci-defaults/20-layer2-config-generate
+++ b/iopsys-brcm63xx-arm/base-files/etc/uci-defaults/20-layer2-config-generate
@@ -91,7 +91,8 @@ populate_atm_device() {
 
 	ATMDEV="${ATMDEV:-atm0}"
 
-	WANDEV="$ATMDEV.1"
+	#WANDEV="$ATMDEV.1"
+	WANDEV="$ATMDEV" # Until VLAN issue is fixed
 
 	WANIFNAME="$WANIFNAME $WANDEV"
 
@@ -120,7 +121,8 @@ populate_ptm_device() {
 
 	PTMDEV="${PTMDEV:-ptm0}"
 
-	WANDEV="$PTMDEV.1"
+	#WANDEV="$PTMDEV.1"
+	WANDEV="$PTMDEV" # Until VLAN issue is fixed
 
 	WANIFNAME="$WANIFNAME $WANDEV"
 
@@ -137,7 +139,8 @@ populate_eth_device() {
 
 	ETHDEV="$(db -q get hw.board.ethernetWanPort)"
 
-	WANDEV="$ETHDEV.1"
+	#WANDEV="$ETHDEV.1"
+	WANDEV="$ETHDEV" # Until VLAN issue is fixed
 
 	WANIFNAME="$WANIFNAME $WANDEV"