diff --git a/autoinstall/user-data b/autoinstall/user-data
index cee7e7f..db4c02e 100644
--- a/autoinstall/user-data
+++ b/autoinstall/user-data
@@ -105,16 +105,16 @@ autoinstall:
       cat > /target/etc/systemd/system/cezen-setup.service << 'EOF'
       [Unit]
       Description=Cezen AI Suite — Console Setup Wizard
-      After=network-online.target avahi-daemon.service
-      Wants=network-online.target
-      Before=getty@tty1.service
+      After=cloud-final.service cloud-init.target network-online.target avahi-daemon.service
+      Wants=cloud-init.target network-online.target
       Conflicts=getty@tty1.service
       ConditionPathExists=!/opt/cezen/.setup-done
 
       [Service]
-      Type=simple
-      ExecStart=/opt/cezen/firstboot-setup.sh
-      StandardInput=tty
+      Type=idle
+      ExecStartPre=-/usr/bin/systemctl stop getty@tty1.service
+      ExecStart=/bin/bash -lc 'clear >/dev/tty1 2>/dev/null || true; exec /opt/cezen/firstboot-setup.sh'
+      StandardInput=tty-force
       StandardOutput=tty
       StandardError=tty
       TTYPath=/dev/tty1
@@ -124,7 +124,7 @@ autoinstall:
       Restart=no
 
       [Install]
-      WantedBy=multi-user.target
+      WantedBy=cloud-init.target
       EOF
 
     - curtin in-target -- systemctl enable ssh