diff --git a/Dockerfile b/Dockerfile
index 735adcb..549f10c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 RUN apt-get -qq update && apt-get install -qy --no-install-recommends \
-	git hostapd dnsmasq python3 python3-dev python3-pip build-essential \
+	git hostapd rfkill dnsmasq python3 python3-dev python3-pip build-essential \
     libssl-dev iproute2 mosquitto
 
 RUN pip install --upgrade pipenv
diff --git a/src/setup_apmode.sh b/src/setup_apmode.sh
index b1023b3..5c4a434 100755
--- a/src/setup_apmode.sh
+++ b/src/setup_apmode.sh
@@ -20,4 +20,8 @@ chown mosquitto /run/mosquitto
 echo -e "listener 1883 0.0.0.0\nallow_anonymous true\n" >> /etc/mosquitto/mosquitto.conf
 /usr/sbin/mosquitto -d -c /etc/mosquitto/mosquitto.conf
 
-printf "ssid=cloudcutter-flash\nchannel=1\nlogger_stdout_level=4\ninterface=$WLAN" | hostapd /dev/stdin -P $(pwd)/hostapd.pid -B
\ No newline at end of file
+# Fixes WiFi softblock issues
+rfkill unblock wifi
+
+# Run in 802.11g on fixed chan 1 for consistency across setups
+printf "ssid=cloudcutter-flash\nchannel=1\nhw_mode=g\nlogger_stdout_level=4\ninterface=$WLAN" | hostapd /dev/stdin -P $(pwd)/hostapd.pid -B