diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service
index d5d588ad..c291c3d2 100644
--- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service
+++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service
@@ -7,9 +7,9 @@ ConditionPathExists=!/run/subiquity/complete
 StartLimitInterval=0
 
 [Service]
-Environment=PYTHONPATH=/usr/share/subiquity
+Environment=SNAP_REEXEC=0
 ExecStartPre=/bin/systemctl stop serial-getty@%I
-ExecStart=/sbin/agetty -n --keep-baud -l /snap/bin/subiquity --login-options "--serial" 115200,38400,9600 %I $TERM
+ExecStart=/usr/bin/snap run subiquity.subiquity-service %I
 ExecStopPost=/bin/systemctl start serial-getty@%I
 Type=idle
 Restart=always