diff --git a/image/sysroot-tree/usr/lib/systemd/system-preset/20-constellation-base.preset b/image/sysroot-tree/usr/lib/systemd/system-preset/20-constellation-base.preset
index b213385af..f74d34ec8 100644
--- a/image/sysroot-tree/usr/lib/systemd/system-preset/20-constellation-base.preset
+++ b/image/sysroot-tree/usr/lib/systemd/system-preset/20-constellation-base.preset
@@ -2,6 +2,7 @@ enable systemd-timesyncd.service
 enable systemd-networkd.service
 enable systemd-networkd-wait-online.service
 enable configure-constel-csp.service
+enable serial-getty@tty0.service
 enable dbus.service
 enable dbus-broker.service
 enable dbus-daemon.service
diff --git a/image/sysroot-tree/usr/lib/systemd/system/serial-getty@ttyS0.service.d/autologin.conf b/image/sysroot-tree/usr/lib/systemd/system/serial-getty@ttyS0.service.d/autologin.conf
new file mode 100644
index 000000000..77db15a0a
--- /dev/null
+++ b/image/sysroot-tree/usr/lib/systemd/system/serial-getty@ttyS0.service.d/autologin.conf
@@ -0,0 +1,12 @@
+[Unit]
+Description=autologin
+ConditionPathExists=/proc/cmdline
+ConditionKernelCommandLine=|constellation.console
+ConditionKernelCommandLine=|constellation.debug
+
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty -o '-p -f -- \\u' --keep-baud --autologin root 115200,57600,38400,9600 - $TERM
+
+[Install]
+WantedBy=multi-user.target
diff --git a/image/system/variants.bzl b/image/system/variants.bzl
index a499ca741..cfc8c5392 100644
--- a/image/system/variants.bzl
+++ b/image/system/variants.bzl
@@ -86,6 +86,7 @@ csp_settings = {
         },
     },
     "qemu": {
+        "kernel_command_line": "constellation.console",  # All qemu images have console enabled independent of stream
         "kernel_command_line_dict": {
             "console": "ttyS0",
             "constel.csp": "qemu",
@@ -135,6 +136,7 @@ attestation_variant_settings = {
 
 stream_settings = {
     "console": {
+        "kernel_command_line": "constellation.console",
     },
     "debug": {
         "kernel_command_line": "constellation.debug",