diff --git a/opensync-gateway-cloud-docker/src/main/docker/app/run.sh b/opensync-gateway-cloud-docker/src/main/docker/app/run.sh
index 66befd5..d3617db 100755
--- a/opensync-gateway-cloud-docker/src/main/docker/app/run.sh
+++ b/opensync-gateway-cloud-docker/src/main/docker/app/run.sh
@@ -60,15 +60,19 @@ then
 fi
 
 DEFAULT_BRIDGE="${DEFAULT_BRIDGE:=br-lan}"
-DEFAULT_WAN="${DEFAULT_WAN:=eth}"
-DEFAULT_LAN="${DEFAULT_LAN:=br-lan}"
+DEFAULT_WAN_TYPE="${DEFAULT_WAN_TYPE:=eth}"
+DEFAULT_LAN_TYPE="${DEFAULT_LAN_TYPE:=bridge}"
+DEFAULT_LAN_NAME="${DEFAULT_LAN_NAME:=lan}"
+
 
 AUTO_PROV_CUSTOMER_ID="${AUTO_PROV_CUSTOMER_ID:=2}"
  
 PROV_PROPS=" "
 PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_bridge=$DEFAULT_BRIDGE"
-PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_wan=$DEFAULT_WAN"
-PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_lan=$DEFAULT_LAN"
+PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_wan_type=$DEFAULT_WAN_TYPE"
+PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_lan_type=$DEFAULT_LAN_TYPE"
+PROV_PROPS+=" -Dconnectus.ovsdb.wifi-iface.default_lan_name=$DEFAULT_LAN_NAME"
+
 PROV_PROPS+=" -Dconnectus.ovsdb.autoProvisionedCustomerId=$AUTO_PROV_CUSTOMER_ID"
 
 export ALL_PROPS="$PROFILES $SSL_PROPS $CLIENT_MQTT_SSL_PROPS $OVSDB_PROPS $MQTT_PROPS $LOGGING_PROPS $RESTAPI_PROPS $SPRING_EXTRA_PROPS $HOST_PROPS $PROV_PROPS"
diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
index 089d0d9..0d24f1d 100644
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
@@ -2203,11 +2203,7 @@ public class OvsdbDao {
 
         List<RadioType> enabledRadiosFromAp = new ArrayList<>();
         getEnabledRadios(ovsdbClient, enabledRadiosFromAp);
-       
-        ConnectNodeInfo connectNodeInfo = getConnectNodeInfo(ovsdbClient);
-        
-        LOG.info("connectNodeInfo = {}", connectNodeInfo.toString());
-
+              
         for (Profile ssidProfile : opensyncApConfig.getSsidProfile()) {
 
             SsidConfiguration ssidConfig = (SsidConfiguration) ssidProfile.getDetails();
@@ -2341,7 +2337,7 @@ public class OvsdbDao {
                 if (!getProvisionedWifiVifConfigs(ovsdbClient).containsKey(ifName + "_" + ssidConfig.getSsid())) {
                     try {
 
-                        configureSingleSsid(ovsdbClient, connectNodeInfo.lanIfName, ifName, ssidConfig.getSsid(),
+                        configureSingleSsid(ovsdbClient, defaultLanInterfaceName, ifName, ssidConfig.getSsid(),
                                 ssidBroadcast, security, freqBand, ssidConfig.getVlanId(), rrmEnabled, enable80211r,
                                 minHwMode, enabled, keyRefresh, uapsdEnabled, apBridge, ssidConfig.getForwardMode(),
                                 gateway, inet, dns, ipAssignScheme);