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-pro/oem-azure-pro-2.3.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild
index 66586de476..4885a2e24f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/oem-azure-pro-2.3.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 arm64"
 IUSE=""
 
 # no source directory
@@ -20,7 +20,7 @@ S="${WORKDIR}"
 # would result in the conflict of `base.ign`
 RDEPEND="
   ~app-emulation/wa-linux-agent-${PV}
-  x11-drivers/nvidia-drivers
+	amd64? ( x11-drivers/nvidia-drivers )
 "
 
 src_prepare() {
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
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15
index 4d23e37143..e9b5d8a28f 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.15
@@ -41,7 +41,6 @@ CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_SBRIDGE=m
 CONFIG_EDAC_X38=m
 CONFIG_EFI_VARS=m
-CONFIG_FB_HYPERV=m
 CONFIG_FB_VESA=y
 CONFIG_FCOE_FNIC=m
 CONFIG_FTRACE_SYSCALLS=y
@@ -50,17 +49,12 @@ CONFIG_GART_IOMMU=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_HID=m
-CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HPET=y
 CONFIG_HW_RANDOM_AMD=y
 CONFIG_HW_RANDOM_INTEL=y
 CONFIG_HW_RANDOM_VIA=y
-CONFIG_HYPERV=m
 CONFIG_HYPERVISOR_GUEST=y
-CONFIG_HYPERV_BALLOON=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=m
 CONFIG_IA32_EMULATION=y
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_USNIC=m
@@ -87,6 +81,7 @@ CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_MICROCODE_AMD=y
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_SPECTRUM=m
 CONFIG_MMC_SDHCI_ACPI=m
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15
index 58ba46ab8d..24ef5ab99e 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15
@@ -183,6 +183,7 @@ CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 CONFIG_FB=y
 CONFIG_FB_EFI=y
+CONFIG_FB_HYPERV=m
 CONFIG_FCOE=m
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FORCEDETH=m
@@ -213,6 +214,7 @@ CONFIG_HID_APPLE=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_CHERRY=m
 CONFIG_HID_EZKEY=m
+CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
@@ -226,6 +228,10 @@ CONFIG_HWMON=m
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_HYPERV=m
+CONFIG_HYPERV_BALLOON=m
+CONFIG_HYPERV_NET=m
+CONFIG_HYPERV_UTILS=m
 CONFIG_HZ_1000=y
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD8111=m