diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-fvp-base.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-fvp-base.inc
index badec193..7069c4d7 100644
--- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-fvp-base.inc
+++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-fvp-base.inc
@@ -2,6 +2,5 @@ EDK2_BUILD_RELEASE = "0"
 EDK2_PLATFORM      = "ArmVExpress-FVP-AArch64"
 EDK2_PLATFORM_DSC  = "Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc"
 EDK2_BIN_NAME      = "FVP_AARCH64_EFI.fd"
-EDK2_ARCH          = "AARCH64"
 
 COMPATIBLE_MACHINE = "fvp-base"
diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
index c8400132..8930c040 100644
--- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
+++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc
@@ -3,7 +3,6 @@ EDK2_BUILD_RELEASE = "0"
 EDK2_PLATFORM      = "n1sdp"
 EDK2_PLATFORM_DSC  = "Platform/ARM/N1Sdp/N1SdpPlatform.dsc"
 EDK2_BIN_NAME      = "BL33_AP_UEFI.fd"
-EDK2_ARCH          = "AARCH64"
 
 COMPATIBLE_MACHINE = "n1sdp"
 
diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc
index 708cd4c4..e26225f8 100644
--- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc
+++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc
@@ -3,6 +3,5 @@ EDK2_BUILD_RELEASE = "0"
 EDK2_PLATFORM      = "Sgi575"
 EDK2_PLATFORM_DSC  = "Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc"
 EDK2_BIN_NAME      = "BL33_AP_UEFI.fd"
-EDK2_ARCH          = "AARCH64"
 
 COMPATIBLE_MACHINE = "sgi575"
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
index f38ee9ca..264ffa94 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
@@ -28,7 +28,13 @@ EDK2_PLATFORM      = "unset"
 EDK2_PLATFORM_DSC  = "unset"
 EDK2_BIN_NAME      = ""
 # build --arch
-EDK2_ARCH          = ""
+EDK2_ARCH         ?= "unset"
+EDK2_ARCH:arm      = "ARM"
+EDK2_ARCH:aarch64  = "AARCH64"
+EDK2_ARCH:x86      = "IA32"
+EDK2_ARCH:x86-64   = "X64"
+EDK2_ARCH:riscv64  = "RISCV64"
+
 # Extra arguments passed to build
 EDK2_EXTRA_BUILD   = ""
 
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
index c0fc2629..93f1f735 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
@@ -4,7 +4,6 @@ COMPATIBLE_MACHINE:qemu-generic-arm64 = "qemu-generic-arm64"
 DEPENDS:append:qemu-generic-arm64 = " virtual/trusted-firmware-a coreutils-native"
 
 EDK2_BUILD_RELEASE:aarch64:qemuall = "1"
-EDK2_ARCH:aarch64:qemuall          = "AARCH64"
 
 EDK2_PLATFORM:qemu-generic-arm64      = "SbsaQemu"
 EDK2_PLATFORM_DSC:qemu-generic-arm64  = "Platform/Qemu/SbsaQemu/SbsaQemu.dsc"
diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb
index 2c269487..c4e07527 100644
--- a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb
+++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb
@@ -14,7 +14,6 @@ SRCREV_acs = "1b3a37214fe6809e07e471f79d1ef856461bc803"
 SRCREV_libc = "61687168fe02ac4d933a36c9145fdd242ac424d1"
 
 COMPATIBLE_HOST = "aarch64.*-linux"
-EDK2_ARCH = "AARCH64"
 EDK2_PLATFORM = "Shell"
 EDK2_PLATFORM_DSC = "ShellPkg/ShellPkg.dsc"
 EDK2_EXTRA_BUILD = "--module ShellPkg/Application/sbsa-acs/uefi_app/SbsaAvs.inf"