diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index ed549212..282d008c 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -462,12 +462,12 @@ atheros_wifi() {
 }
 
 configure_wifi() {
-    if [[ $VARIANT == "mesh" || $VARIANT == "meshclient" || $VARIANT == "meshusb" ]]; then
+    if [[ $VARIANT == "mesh"* ]]; then
         return
     fi
 
     if [ -f $WIFI_NETWORKS_FILE ]; then
-        chroot "$rootdir" ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE --networks $WIFI_NETWORKS_FILE
+        chroot "$rootdir" ${PROJECT_NAME}-wifi --networks $WIFI_NETWORKS_FILE
         return
     fi
 
@@ -475,9 +475,9 @@ configure_wifi() {
         if [ ${#WIFI_PASSPHRASE} -lt 2 ]; then
             return
         fi
-        chroot "$rootdir" ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $WIFI_HOTSPOT
+        chroot "$rootdir" ${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $WIFI_HOTSPOT
     else
-        chroot "$rootdir" ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE --hotspot $WIFI_HOTSPOT
+        chroot "$rootdir" ${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE --hotspot $WIFI_HOTSPOT
     fi
 }
 
diff --git a/src/freedombone-utils-wifi b/src/freedombone-utils-wifi
index 5152c09e..44f5db8e 100755
--- a/src/freedombone-utils-wifi
+++ b/src/freedombone-utils-wifi
@@ -60,7 +60,7 @@ function setup_wifi {
     fi
 
     if [ -f $WIFI_NETWORKS_FILE ]; then
-        ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE --networks $WIFI_NETWORKS_FILE
+        ${PROJECT_NAME}-wifi --networks $WIFI_NETWORKS_FILE
         mark_completed $FUNCNAME
         return
     fi
@@ -74,9 +74,9 @@ function setup_wifi {
             echo $'Wifi passphrase was too short'
             return
         fi
-        ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
+        ${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
     else
-        ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
+        ${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
     fi
     mark_completed $FUNCNAME
 }