diff --git a/image/system/mkosi.conf b/image/system/mkosi.conf
index f49c9ebd8..b23cf00a3 100644
--- a/image/system/mkosi.conf
+++ b/image/system/mkosi.conf
@@ -13,7 +13,7 @@ Seed=0e9a6fe0-68f6-408c-bbeb-136054d20445
 SourceDateEpoch=0
 Bootable=yes
 Bootloader=uki
-KernelCommandLine=preempt=full rd.shell=0 rd.emergency=reboot loglevel=8 console=ttyS0
+KernelCommandLine=preempt=full rd.shell=0 rd.emergency=reboot loglevel=8
 RemoveFiles=/var/log
 RemoveFiles=/var/cache
 RemoveFiles=/etc/pki/ca-trust/extracted/java/cacerts
diff --git a/image/system/variants.bzl b/image/system/variants.bzl
index 75dd7c21e..3cca05c95 100644
--- a/image/system/variants.bzl
+++ b/image/system/variants.bzl
@@ -55,6 +55,7 @@ base_cmdline = "selinux=1 enforcing=0 audit=0"
 csp_settings = {
     "aws": {
         "kernel_command_line_dict": {
+            "console": "ttyS0",
             "constel.csp": "aws",
             "idle": "poll",
             "mitigations": "auto",
@@ -62,20 +63,21 @@ csp_settings = {
     },
     "azure": {
         "kernel_command_line_dict": {
+            "console": "ttyS0",
             "constel.csp": "azure",
             "mitigations": "auto,nosmt",
         },
     },
     "gcp": {
         "kernel_command_line_dict": {
+            "console": "ttyS0",
             "constel.csp": "gcp",
             "mitigations": "auto,nosmt",
         },
     },
     "openstack": {
-        "kernel_command_line": "console=tty0 console=ttyS0",
+        "kernel_command_line": "console=tty0 console=ttyS0 console=ttyS1",
         "kernel_command_line_dict": {
-            "console": "tty0",
             "constel.csp": "openstack",
             "kvm_amd.sev": "1",
             "mem_encrypt": "on",
@@ -86,6 +88,7 @@ csp_settings = {
     "qemu": {
         "autologin": True,
         "kernel_command_line_dict": {
+            "console": "ttyS0",
             "constel.csp": "qemu",
             "mitigations": "auto,nosmt",
         },