diff --git a/post_install.sh b/post_install.sh
index 4ff2943..44423ba 100644
--- a/post_install.sh
+++ b/post_install.sh
@@ -54,21 +54,27 @@ tee /usr/lib/firefox-esr/distribution/policies.json > /dev/null <<'EOF'
 }
 EOF
 chown -R kiosk:kiosk /home/kiosk/.config
-tee /etc/systemd/system/firefox-kiosk.service > /dev/null <<'EOF'
-[Unit]
-Description=Firefox Kiosk
-After=graphical.target
-Wants=graphical.target
+# tee /etc/systemd/system/firefox-kiosk.service > /dev/null <<'EOF'
+# [Unit]
+# Description=Firefox Kiosk
+# After=graphical.target
+# Wants=graphical.target
 
-[Service]
-User=kiosk
-Type=simple
-ExecStart=/usr/bin/firefox --kiosk https://mahn.ke
-Restart=always
-RestartSec=5
-Environment=DISPLAY=:0
+# [Service]
+# User=kiosk
+# Type=simple
+# ExecStart=/usr/bin/firefox --kiosk https://c3nav.ke
+# Restart=always
+# RestartSec=5
+# Environment=DISPLAY=:0
 
-[Install]
-WantedBy=graphical.target
-EOF
-systemctl enable firefox-kiosk.service
\ No newline at end of file
+# [Install]
+# WantedBy=graphical.target
+# EOF
+# systemctl enable firefox-kiosk.service
+
+tee /home/kiosk/.bash_profile > /dev/null <<'EOF'
+if [ -z "$WAYLAND_DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
+    exec cage firefox --kiosk https://c3nav.de
+fi
+EOF
\ No newline at end of file
diff --git a/preseed.cfg b/preseed.cfg
index 7518b53..b934651 100644
--- a/preseed.cfg
+++ b/preseed.cfg
@@ -51,6 +51,8 @@ d-i pkgsel/include string \
     openbox \
     chromium \
     sudo \
+    cage \
+    firefox-esr \
     curl
 
 d-i pkgsel/exclude string gnome-software