diff --git a/preseed.cfg b/preseed.cfg
index d5f0f11..ab6082e 100644
--- a/preseed.cfg
+++ b/preseed.cfg
@@ -1,20 +1,16 @@
-### Localization
 d-i debian-installer/locale string en_US.UTF-8
 d-i keyboard-configuration/xkb-keymap select us
 d-i time/zone string UTC
 
-### Network
 d-i netcfg/choose_interface select auto
 d-i netcfg/get_hostname string kiosk
 d-i netcfg/get_domain string local
 
-### Mirror
 d-i mirror/country string manual
 d-i mirror/http/hostname string deb.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
 
-### Users
 d-i passwd/root-login boolean false
 d-i passwd/user-fullname string Kiosk User
 d-i passwd/username string kiosk
@@ -22,17 +18,23 @@ d-i passwd/user-password password kiosk
 d-i passwd/user-password-again password kiosk
 d-i user-setup/allow-password-weak boolean true
 
-### Clock
 d-i clock-setup/utc boolean true
 d-i clock-setup/ntp boolean true
 
-### Partitioning (⚠ wipes disk)
+d-i partman-auto/disk string /dev/sda
 d-i partman-auto/method string regular
 d-i partman-auto/choose_recipe select atomic
-d-i partman-auto/confirm boolean true
-d-i partman-auto/confirm_nooverwrite boolean true
+d-i partman/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+
+d-i apt-setup/use_mirror boolean true
+d-i apt-setup/cdrom/set-first boolean false
+d-i apt-setup/cdrom/set-next boolean false
+d-i apt-setup/cdrom/set-failed boolean false
+d-i apt-setup/disable-cdrom-entries boolean true
 
-### Package selection
 tasksel tasksel/first multiselect standard, ssh-server
 d-i pkgsel/include string \
     xorg \
@@ -41,9 +43,77 @@ d-i pkgsel/include string \
     sudo \
     curl
 
-### Bootloader
+d-i pkgsel/exclude string gnome-software
+
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/bootdev string default
 
-### Finishing up
 d-i finish-install/reboot_in_progress note
+
+d-i preseed/late_command string \
+    in-target sh -c 'printf "[daemon]\nAutomaticLoginEnable=true\nAutomaticLogin=kiosk\n\n[security]\n\n[xdmcp]\n\n[chooser]\n\n[debug]\n" > /etc/gdm3/daemon.conf'; \
+    in-target sh -c 'printf "[Desktop Entry]\nType=Application\nName=Firefox\nExec=firefox --kiosk https://mahn.ke\nX-GNOME-Autostart-enabled=true\n" > /etc/xdg/autostart/myapp.desktop'; \
+    in-target sh -c 'sudo tee /usr/lib/firefox-esr/distribution/policies.json > /dev/null <<EOF
+{
+  "policies": {
+    "DisableDeveloperTools": true,
+    "BlockAboutAddons": true,
+    "BlockAboutConfig": true,
+    "BlockAboutProfiles": true,
+    "BlockAboutSupport": true,
+    "DisableFirefoxAccounts": true,
+    "DisablePrivateBrowsing": true,
+    "DisableProfileImport": true,
+    "DisableProfileRefresh": true,
+    "DisableSafeMode": true,
+    "DisablePocket": true,
+    "DisableFirefoxScreenshots": true,
+    "DisableSetDesktopBackground": true,
+    
+    "Homepage": {
+      "URL": "https://mahn.ke",
+      "Locked": true
+    },
+    
+    "NewTabPage": {
+      "Enabled": false
+    },
+    
+    "DownloadDirectory": {
+      "Path": "C:\\KioskDownloads",
+      "Locked": true
+    },
+    
+    "PromptForDownloadLocation": false,
+    
+    "StartDownloadsInTempDirectory": false,
+    
+    "DisableAppUpdate": true,
+    
+    "Permissions": {
+      "Camera": "deny",
+      "Microphone": "deny",
+      "Location": "deny",
+      "Notifications": "deny"
+    },
+    
+    "ShowHomeButton": false,
+    "DisplayMenuBar": false,
+    "DisplayBookmarksToolbar": false,
+    "policies": {
+        "UserMessaging": {
+            "ExtensionRecommendations": false,
+            "FeatureRecommendations": false,
+            "UrlbarInterventions": false,
+            "SkipOnboarding": false,
+            "MoreFromMozilla": false,
+            "FirefoxLabs": false,
+            "Locked": false
+        }
+    }
+  }
+}
+
+EOF'
+    in-target chown -R kiosk:kiosk /home/kiosk/.config; \
+    in-target mkdir -p /usr/lib/firefox-esr/distribution
\ No newline at end of file