diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg
index 5e5449f25a..9fa2f0e55c 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg
@@ -2,8 +2,13 @@
 
 set oem_id="azure"
 
+set linux_append="flatcar.autologin"
+
 # Azure only has a serial console.
-set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200 flatcar.autologin"
 serial com0 --speed=115200 --word=8 --parity=no
 terminal_input serial_com0
 terminal_output serial_com0
+
+if [ "$grub_platform" = "pc" ]; then
+  set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200"
+fi
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg
index 5e5449f25a..9fa2f0e55c 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg
@@ -2,8 +2,13 @@
 
 set oem_id="azure"
 
+set linux_append="flatcar.autologin"
+
 # Azure only has a serial console.
-set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200 flatcar.autologin"
 serial com0 --speed=115200 --word=8 --parity=no
 terminal_input serial_com0
 terminal_output serial_com0
+
+if [ "$grub_platform" = "pc" ]; then
+  set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200"
+fi