diff --git a/diskless.pkr.hcl b/diskless.pkr.hcl
index 3291ea7..859206a 100644
--- a/diskless.pkr.hcl
+++ b/diskless.pkr.hcl
@@ -394,9 +394,11 @@ build {
       "chmod 0644 /etc/kiosk/kiosk.env",
       # Label the new files so they survive into the enforcing erofs.
       "restorecon -R /usr/local/bin/kiosk-session /etc/systemd/system/kiosk.service /etc/pam.d/kiosk /etc/xdg/weston /etc/kiosk /etc/chromium /etc/chromium-browser",
-      # Boot graphical and start the kiosk (replaces the tty1 getty).
+      # Enable the kiosk on multi-user.target (its [Install] WantedBy) so it
+      # starts on a normal boot and takes tty1 from the getty (Conflicts=). No
+      # set-default graphical.target: the kiosk needs no display-manager target,
+      # and relying on graphical.target left it dead at boot.
       "systemctl enable kiosk.service",
-      "systemctl set-default graphical.target",
       "rm -rf /tmp/kiosk",
       "echo \"==> kiosk enabled: $KIOSK_URL\"",
     ]
diff --git a/files/banner/fleet-issue b/files/banner/fleet-issue
index acf509f..1fa2849 100644
--- a/files/banner/fleet-issue
+++ b/files/banner/fleet-issue
@@ -1,17 +1,17 @@
 +===================================================================+
 |                                                                   |
-|                     I S V   A U R E L I A N                        |
+|                     I S V   A U R E L I A N                       |
 |                                                                   |
-|               Lancer-class Deep Survey Cruiser                     |
-|                   Fleet Registry  FN-774                           |
+|               Lancer-class Deep Survey Cruiser                    |
+|                   Fleet Registry  FN-774                          |
 |                                                                   |
 +===================================================================+
 |                                                                   |
-|   AUTHORIZED CREW ONLY.  This terminal is bonded to the ship's     |
-|   core AI; every keystroke is logged to the bridge.  Unauthorized  |
-|   access is a breach of the Fleet Charter and will be met with     |
-|   containment protocols.  If you are not cleared for this vessel,  |
-|   disconnect now and report to your duty station.                  |
+|   AUTHORIZED CREW ONLY.  This terminal is bonded to the ship's    |
+|   core AI; every keystroke is logged to the bridge.  Unauthorized |
+|   access is a breach of the Fleet Charter and will be met with    |
+|   containment protocols.  If you are not cleared for this vessel, |
+|   disconnect now and report to your duty station.                 |
 |                                                                   |
 |              Safe travels, and mind the airlocks.                 |
 |                                                                   |
diff --git a/files/kiosk/kiosk.service b/files/kiosk/kiosk.service
index 3e72e1c..4302691 100644
--- a/files/kiosk/kiosk.service
+++ b/files/kiosk/kiosk.service
@@ -42,4 +42,9 @@ Restart=always
 RestartSec=2
 
 [Install]
-WantedBy=graphical.target
+# multi-user.target, NOT graphical.target: the kiosk launches weston directly
+# (no display manager), and multi-user.target is always reached on a normal boot
+# — graphical.target is only active if it's the default AND nothing blocks it,
+# which left the kiosk dead at boot (started fine on manual restart). Conflicts=
+# getty@tty1 still hands tty1 over to the kiosk.
+WantedBy=multi-user.target