diff --git a/.github/workflows/sysarch_ci.yml b/.github/workflows/sysarch_ci.yml
index a543f3ea..3b54b361 100644
--- a/.github/workflows/sysarch_ci.yml
+++ b/.github/workflows/sysarch_ci.yml
@@ -206,11 +206,13 @@ jobs:
           source edksetup.sh
           make -C BaseTools/Source/C
           source ShellPkg/Application/sysarch-acs/tools/scripts/acsbuild.sh ${{ matrix.target.arg }}
+          build -a AARCH64 -t GCC -p ShellPkg/ShellPkg.dsc -m ShellPkg/Application/Shell/Shell.inf
 
       - name: Move output to toolchain folder
         run: |
           mkdir -p "artifacts/${{ matrix.toolchain }}"
           cp "edk2/Build/Shell/DEBUG_GCC/AARCH64/${{ matrix.target.outfile }}" "artifacts/${{ matrix.toolchain }}/${{ matrix.target.artifact }}"
+          cp "edk2/Build/Shell/DEBUG_GCC/AARCH64/ShellPkg/Application/Shell/Shell/OUTPUT/Shell.efi" "artifacts/${{ matrix.toolchain }}/"
 
       - name: Upload ${{ matrix.target.artifact }}
         uses: actions/upload-artifact@v4