diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202405.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202408.bb
similarity index 93%
rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202405.bb
rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202408.bb
index 851150744c6d..d89a79015a83 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202405.bb
+++ b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202408.bb
@@ -10,7 +10,7 @@ LICENSE = "BSD-2-Clause-Patent"
 SRC_URI = "git://github.com/tianocore/edk2.git;branch=master;protocol=https"
 LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a"
 
-SRCREV = "3e722403cd16388a0e4044e705a2b34c841d76ca"
+SRCREV = "b158dad150bf02879668f72ce306445250838201"
 
 UPSTREAM_CHECK_GITTAGREGEX = "^edk2-stable(?P<pver>\d+)$"
 
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb
deleted file mode 100644
index 294a22322d9a..000000000000
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202405.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SRCREV_edk2           ?= "3e722403cd16388a0e4044e705a2b34c841d76ca"
-SRCREV_edk2-platforms ?= "59c686673992d7549c2b054773d5d1b5e739a88b"
-
-# FIXME - clang is having issues with antlr
-TOOLCHAIN:aarch64 = "gcc"
-
-require recipes-bsp/uefi/edk2-firmware.inc
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202408.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202408.bb
new file mode 100644
index 000000000000..81bfc0002396
--- /dev/null
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202408.bb
@@ -0,0 +1,7 @@
+SRCREV_edk2           ?= "b158dad150bf02879668f72ce306445250838201"
+SRCREV_edk2-platforms ?= "a3c898956a4d48dc5980336fa6ce6eeb23c4f72b"
+
+# FIXME - clang is having issues with antlr
+TOOLCHAIN:aarch64 = "gcc"
+
+require recipes-bsp/uefi/edk2-firmware.inc
diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
index 305588d1a11b..b6361346c5b4 100644
--- a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
+++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.4.bb
@@ -1,4 +1,4 @@
-require recipes-bsp/uefi/edk2-firmware_202405.bb
+require recipes-bsp/uefi/edk2-firmware_202408.bb
 PROVIDES:remove = "virtual/bootloader"
 
 LICENSE += "& Apache-2.0"