diff --git a/.github/workflows/linux_gcc_edk2.yml b/.github/workflows/linux_gcc_edk2.yml
index b14f939..23eac88 100644
--- a/.github/workflows/linux_gcc_edk2.yml
+++ b/.github/workflows/linux_gcc_edk2.yml
@@ -37,9 +37,13 @@ jobs:
         sudo ln -s /usr/bin/riscv64-linux-gnu-gcc-12 /usr/bin/riscv64-linux-gnu-gcc
         sudo ln -s /usr/bin/riscv64-linux-gnu-gcc-ar-12 /usr/bin/riscv64-linux-gnu-gcc-ar
 
+    - name: Fix the BROKEN cmocka.git EDK2 dependency
+      run: git config --global url."https://github.com/tianocore/edk2-cmocka.git".insteadOf "https://git.cryptomilk.org/projects/cmocka.git"
+
     - name: Checkout repository and submodules
       uses: actions/checkout@v4
       with:
+        # Need fetch-depth: 0 to obtain the EDK2 stable tag
         fetch-depth: 0
         submodules: recursive
 
@@ -67,6 +71,15 @@ jobs:
           done
         done
 
+    - name: Create individual Shell binaries
+      run: |
+        for ARCH in ${{ env.ARCHS }}; do
+          cp edk2/Build/Shell/RELEASE_${{ env.COMPILER }}/$ARCH/Shell_${{ env.FULL_SHELL_GUID }}.efi ./shell${ARCH,,}.efi
+        done
+        if [ -f ./shellaarch64.efi ]; then
+          mv ./shellaarch64.efi ./shellaa64.efi
+        fi
+
     - name: Create ISO filesystem structure
       run: |
         for BUILD_TYPE in ${{ env.BUILD_TYPES }}; do
@@ -117,9 +130,10 @@ jobs:
           sha256sum $BUILD_TYPE/efi/boot/*.efi
         done
         sha256sum *.iso
+        sha256sum *.efi
 
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+    - name: Upload ISO artifacts
+      uses: actions/upload-artifact@v4
       with:
         name: ISOs
         path: ./*.iso
@@ -139,4 +153,5 @@ jobs:
         body_path: ./body.txt
         files: |
           ./*.iso
+          ./*.efi
           ./Version.xml
diff --git a/README.md b/README.md
index 608c112..9b8440b 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ UEFI-Shell
 
 [![Build status](https://img.shields.io/github/actions/workflow/status/pbatard/UEFI-Shell/linux_gcc_edk2.yml?label=Build%20Status&style=flat-square)](https://github.com/pbatard/UEFI-Shell/actions/workflows/linux_gcc_edk2.yml)
 [![Github stats](https://img.shields.io/github/downloads/pbatard/UEFI-Shell/total.svg?label=Downloads&style=flat-square)](https://github.com/pbatard/UEFI-Shell/releases)
-[![Release](https://img.shields.io/badge/Latest%20Release-23H2%20(edk2--stable202311)-blue.svg?style=flat-square)](https://github.com/pbatard/UEFI-Shell/releases)
+[![Release](https://img.shields.io/badge/Latest%20Release-24H1%20(edk2--stable202405)-blue.svg?style=flat-square)](https://github.com/pbatard/UEFI-Shell/releases)
 [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://opensource.org/licenses/BSD-2-Clause)
 
 This repository contains pre-built UEFI Shell binary images, generated from
diff --git a/edk2 b/edk2
index 8736b8f..3e72240 160000
--- a/edk2
+++ b/edk2
@@ -1 +1 @@
-Subproject commit 8736b8fdca85e02933cdb0a13309de14c9799ece
+Subproject commit 3e722403cd16388a0e4044e705a2b34c841d76ca