diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash
index 68fae47afc..a7170a67cc 100644
--- a/boot/edk2/edk2.hash
+++ b/boot/edk2/edk2.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  e05130e107d476cdec0846f55f22e00fb2cc0030b60fafce464a6cf10134d18d  edk2-edk2-stable202505-git4.tar.gz
+sha256  1e675a98f6bcf81fbae1141779b9e72ec28773d0e5ec77bdcc890f14502615a4  edk2-edk2-stable202508-git4.tar.gz
 sha256  50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80  License.txt
diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk
index 3612c86fb1..05e44c711b 100644
--- a/boot/edk2/edk2.mk
+++ b/boot/edk2/edk2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EDK2_VERSION = edk2-stable202505
+EDK2_VERSION = edk2-stable202508
 EDK2_SITE = https://github.com/tianocore/edk2
 EDK2_SITE_METHOD = git
 EDK2_LICENSE = BSD-2-Clause-Patent
diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash
index f98fa8b647..d088bcc342 100644
--- a/package/edk2-platforms/edk2-platforms.hash
+++ b/package/edk2-platforms/edk2-platforms.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  41ce6307a1477e2c9a8f81f3b8f876a48df8d4fa5a13f59eedb4767323475a07  edk2-platforms-92f7d69e8aa31e0ae06d4dabbcee12f4ebdb78ed.tar.gz
+sha256  4417db79bfb8a9bf601e94e295fec270f99eac3447a6d418ff28ea7dd374d8d6  edk2-platforms-d1b297b2aa693fc723ac883866c925e9d04260c9.tar.gz
 sha256  50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80  License.txt
diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk
index 7c5094fdd3..86b9fea960 100644
--- a/package/edk2-platforms/edk2-platforms.mk
+++ b/package/edk2-platforms/edk2-platforms.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # Keep in sync with latest commit as of the release date for boot/edk2
-EDK2_PLATFORMS_VERSION = 92f7d69e8aa31e0ae06d4dabbcee12f4ebdb78ed
+EDK2_PLATFORMS_VERSION = d1b297b2aa693fc723ac883866c925e9d04260c9
 EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION))
 EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent
 EDK2_PLATFORMS_LICENSE_FILES = License.txt