diff --git a/.github/workflows/linux_edk2.yml b/.github/workflows/linux_edk2.yml
index a01f7820..794d717a 100644
--- a/.github/workflows/linux_edk2.yml
+++ b/.github/workflows/linux_edk2.yml
@@ -16,7 +16,7 @@ env:
   GCC5_AARCH64_PREFIX: aarch64-linux-gnu-
   # The following should usually be set to 'master' but, in case
   # of a regression, a specific SHA-1 can be specified.
-  START_ELF_VERSION: afdb60cc1a8a4aa0c6af68f02b6c1efe6256ba5d
+  START_ELF_VERSION: master
   DTB_VERSION: master
   DTBO_VERSION: master
 
diff --git a/edk2 b/edk2
index cf7c6505..90246a6d 160000
--- a/edk2
+++ b/edk2
@@ -1 +1 @@
-Subproject commit cf7c65059202e7858fbc00ce1f163ee243947e08
+Subproject commit 90246a6d9f6fda3536d042d02867123caabe3aaa
diff --git a/edk2-non-osi b/edk2-non-osi
index eba85cf5..2ac5396d 160000
--- a/edk2-non-osi
+++ b/edk2-non-osi
@@ -1 +1 @@
-Subproject commit eba85cf5d882340b2ce0f845facc31dde0c3dbcb
+Subproject commit 2ac5396ddf24e30fccfa3c72a786b3bae00cd687
diff --git a/edk2-platforms b/edk2-platforms
index 901d3c52..63d520f9 160000
--- a/edk2-platforms
+++ b/edk2-platforms
@@ -1 +1 @@
-Subproject commit 901d3c52ed23f8c341424d46b89d27051043ba07
+Subproject commit 63d520f9431a6aa4ce1df4387dd0a9831f8a13b8