diff --git a/kiosk_skeleton/boot/custom.toml b/kiosk_skeleton/boot/custom.toml
index 0c5e9f9..11266da 100644
--- a/kiosk_skeleton/boot/custom.toml
+++ b/kiosk_skeleton/boot/custom.toml
@@ -1,22 +1,11 @@
 # Raspberry Pi OS "Bookworm" First-Boot Configuration
-# Edit the values below with your details before the first boot.
+# This file is ONLY used to get the device onto the network.
+# All other kiosk configuration is handled by kioskbrowser.ini.
 
 config_version = 1
 
-[system]
-# Set the hostname for the device on the network.
-hostname = "kioskpi"
-
 [wlan]
-# --- Wi-Fi Configuration ---
-# Replace with your Wi-Fi network name (SSID) and password.
 ssid = "YOUR_WIFI_SSID"
 password = "YOUR_WIFI_PASSWORD"
 password_encrypted = false
-hidden = false
-# Set your 2-letter ISO 3166-1 country code (e.g., US, GB, DE).
-country = "GB"
-
-[locale]
-keymap = "us"
-timezone = "Etc/UTC"
\ No newline at end of file
+country = "US"
\ No newline at end of file
diff --git a/kiosk_skeleton/build.sh b/kiosk_skeleton/build.sh
index 69adc97..64c7b38 100755
--- a/kiosk_skeleton/build.sh
+++ b/kiosk_skeleton/build.sh
@@ -54,11 +54,11 @@ echo "tmpfs		/home/pi/.ssh/ tmpfs mode=0700,nosuid,nodev,uid=1000,gid=1000  0
 echo "tmpfs		/root/.ssh/ tmpfs mode=0700,nosuid,nodev,uid=0,gid=0  0       0" >> /etc/fstab
 
 # Create symlinks for configuration files which will later get created at runtime (in /tmp)
-rm /etc/hosts
-rm /etc/hostname
 mkdir -p /etc/wpa_supplicant/
-ln -sf /tmp/hosts /etc/hosts
+touch "${BUILD_DIR}/etc/hostname"
+touch "${BUILD_DIR}/etc/hosts"
 ln -sf /tmp/hostname /etc/hostname
+ln -sf /tmp/hosts /etc/hosts
 ln -sf /tmp/wpa_supplicant.conf /etc/wpa_supplicant/wpa_supplicant.conf
 
 systemctl daemon-reload
@@ -72,9 +72,9 @@ systemctl disable bluetooth || true
 systemctl enable kiosk-ssh-keys
 systemctl enable NetworkManager
 systemctl enable NetworkManager
+systemctl enable kiosk-set-hostname
 systemctl enable kiosk-autossh
 systemctl enable kiosk-watchdog
-systemctl enable kiosk-set-hostname
 systemctl enable ntpdate
 systemctl enable lightdm
 systemctl enable nginx