diff --git a/kiosk_skeleton/build.sh b/kiosk_skeleton/build.sh
index 7d2e76d..4463ddd 100755
--- a/kiosk_skeleton/build.sh
+++ b/kiosk_skeleton/build.sh
@@ -2,7 +2,7 @@
 # This script is being run on the target debian platform
 
 apt update
-DEBIAN_FRONTEND=noninteractive apt install -y lightdm openbox nginx php-fpm php-cli chromium autossh unclutter x11-xserver-utils xdotool htop nano openssh-server rsync x11vnc lm-sensors ntpdate scrot wireless-regdb fontconfig php-cli
+DEBIAN_FRONTEND=noninteractive apt install -y lightdm openbox nginx php-fpm php-cli chromium autossh unclutter x11-xserver-utils xdotool htop nano openssh-server rsync x11vnc lm-sensors ntpdate scrot wireless-regdb fontconfig php-cli uuid-runtime
 
 rsync -a --chown=root:root "/kiosk_skeleton/." "/"
 chmod +x /usr/bin/kiosk-* /usr/bin/get-ini /usr/bin/refresh-screen /usr/bin/schedule-* /usr/bin/setup-refresh-timer
diff --git a/kiosk_skeleton/etc/systemd/system/kiosk-wifi.service b/kiosk_skeleton/etc/systemd/system/kiosk-wifi.service
index b8fddf4..7367147 100644
--- a/kiosk_skeleton/etc/systemd/system/kiosk-wifi.service
+++ b/kiosk_skeleton/etc/systemd/system/kiosk-wifi.service
@@ -1,7 +1,6 @@
 [Unit]
-Description=Configure WiFi from kioskbrowser.ini
-Requires=NetworkManager.service
-After=NetworkManager.service
+Description=Generate NetworkManager connection profile from kioskbrowser.ini
+Before=NetworkManager.service
 
 [Service]
 Type=oneshot
diff --git a/kiosk_skeleton/usr/bin/kiosk-wifi b/kiosk_skeleton/usr/bin/kiosk-wifi
index 6182620..2f1b233 100755
--- a/kiosk_skeleton/usr/bin/kiosk-wifi
+++ b/kiosk_skeleton/usr/bin/kiosk-wifi
@@ -1,12 +1,8 @@
 #!/bin/bash
-# Redirect all output to a log file for debugging
-exec &> /var/log/kiosk-wifi.log
-set -ex
+set -e
 
-echo "--- Kiosk WiFi Configuration Starting ---"
-date
+echo "Generating NetworkManager connection profile..."
 
-echo "Reading configuration from /boot/kioskbrowser.ini..."
 WIFI_SSID=$(get-ini /boot/kioskbrowser.ini wifi ssid)
 WIFI_PSK=$(get-ini /boot/kioskbrowser.ini wifi psk)
 
@@ -15,27 +11,36 @@ if [ -z "${WIFI_SSID}" ]; then
     exit 0
 fi
 
-echo "Configuration found: SSID='${WIFI_SSID}'"
+# Generate a UUID for the connection
+UUID=$(uuidgen)
 
-echo "Waiting for WiFi adapter to be ready..."
-sleep 5
+# Create the NetworkManager connection file
+cat > "/etc/NetworkManager/system-connections/${WIFI_SSID}.nmconnection" << EOF
+[connection]
+id=${WIFI_SSID}
+uuid=${UUID}
+type=wifi
+interface-name=wlan0
+autoconnect=true
 
-echo "Checking radio status..."
-nmcli radio all
+[wifi]
+mode=infrastructure
+ssid=${WIFI_SSID}
 
-echo "Ensuring WiFi radio is on..."
-nmcli radio wifi on
+[wifi-security]
+auth-alg=open
+key-mgmt=wpa-psk
+psk=${WIFI_PSK}
 
-echo "Checking device status..."
-nmcli device status
+[ipv4]
+method=auto
 
-echo "Attempting to connect to WiFi network..."
-nmcli device wifi connect "${WIFI_SSID}" password "${WIFI_PSK}"
+[ipv6]
+method=auto
+EOF
 
-echo "Waiting a few seconds for connection to establish..."
-sleep 10
+# Set the correct permissions
+chmod 600 "/etc/NetworkManager/system-connections/${WIFI_SSID}.nmconnection"
+chown root:root "/etc/NetworkManager/system-connections/${WIFI_SSID}.nmconnection"
 
-echo "Final connection status:"
-nmcli connection show
-
-echo "--- Kiosk WiFi Configuration Finished ---"
+echo "Successfully created connection profile for ${WIFI_SSID}."