diff --git a/meta-oniro-core/classes/oniro-image.bbclass b/meta-oniro-core/classes/oniro-image.bbclass
index f0107711e3b49b5ae942c2aac85655b6d9562d24..8dfe0afc7e65eaec55db2cd02ebdb8945d8e2c07 100644
--- a/meta-oniro-core/classes/oniro-image.bbclass
+++ b/meta-oniro-core/classes/oniro-image.bbclass
@@ -46,9 +46,6 @@ WKS_FILE:qemux86-64 ?= "x-gpt-efi-disk.wks.in"
 WKS_FILE_DEPENDS:qemux86-64 += "ovmf"
 WKS_FILE_DEPENDS:qemux86 += "ovmf"
 
-WKS_FILE:qemu-generic-arm64 = "x-qemu-efi-disk.wks.in"
-IMAGE_FSTYPES:qemu-generic-arm64 += "wic wic.qcow2"
-
 WKS_FILE:seco-imx8mm-c61-2gb ?= "x-imx-uboot-bootpart.wks.in"
 IMAGE_FSTYPES:seco-imx8mm-c61-2gb ?= "wic.gz wic.bmap"
 
diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index f16630a74e5a073cd20c02c17b7bdbe4d64dc2a6..494e21f298222f75a8b2848d3acff6ba3e8db641 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -73,11 +73,6 @@ PREFERRED_PROVIDER_virtual/kernel:qemux86-64 = "linux-oniro"
 PREFERRED_PROVIDER_virtual/kernel:qemuarm-efi = "linux-oniro"
 PREFERRED_PROVIDER_virtual/kernel:qemuarm64-efi = "linux-oniro"
 
-# qemu-generic-arm64 has issues booting past 5.10. See:
-# https://git.yoctoproject.org/meta-arm/tree/meta-arm/conf/machine/generic-arm64.conf?id=c40fb5348b1d0f8c4a1ed779c8df6ba3cf411930
-# When kernel version is bumped we will have to revisit here.
-PREFERRED_PROVIDER_virtual/kernel_qemu-generic-arm64 = "linux-oniro"
-
 # Prefer GRUB as the EFI provider.
 #
 # The SysOTA+RAUC stack supports GRUB as the point of integration. This is
@@ -103,9 +98,6 @@ IMAGE_EFI_BOOT_FILES += "grubenv;EFI/BOOT/grubenv"
 # (note r-provider is used below)
 PREFERRED_RPROVIDER_virtual-grub-bootconf = "oniro-grub-bootconf"
 
-# qemu-generic-arm64 specific requirements
-PREFERRED_VERSION_optee-os:qemu-generic-arm64 = "3.14.0"
-
 # Default to enabling serial debug console on RaspberryPi
 ENABLE_UART ?= "1"
 
diff --git a/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb b/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb
index d453b72db33ca6cc9787cab8d9635ce7d03bcd56..8a4e3db7f513aca62273c37f9c5deb3be299c8d4 100644
--- a/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb
+++ b/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb
@@ -28,7 +28,7 @@ PROVIDES="linux-oniro virtual/kernel"
 
 KCONF_BSP_AUDIT_LEVEL = "1"
 
-COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuriscv64|qemuriscv32|qemu-generic-arm64)$"
+COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuriscv64|qemuriscv32)$"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"