diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5adfb98e..eee4ebac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -109,7 +109,7 @@ jobs:
           path: |
             bin.tar.xz
             src/cpython
-          key: gam-${{ matrix.jid }}-20230607-py3113
+          key: gam-${{ matrix.jid }}-20230608
 
       - name: Untar Cache archive
         if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true'
@@ -331,7 +331,6 @@ jobs:
           git clone https://github.com/python/cpython.git
           cd "${PYTHON_SOURCE_PATH}"
           export LATEST_STABLE_TAG=$(git tag --list | grep -v a | grep -v rc | grep -v b | sort -Vr | head -n1)
-          export LATEST_STABLE_TAG="v3.11.3"
           git checkout "${LATEST_STABLE_TAG}"
           export COMPILED_PYTHON_VERSION=${LATEST_STABLE_TAG:1} # Trim the "v" prefix
           echo "COMPILED_PYTHON_VERSION=${COMPILED_PYTHON_VERSION}" >> $GITHUB_ENV
@@ -468,9 +467,11 @@ jobs:
           git clone https://github.com/pyinstaller/pyinstaller.git
           cd pyinstaller
           export latest_release=$(git tag --list | grep -v dev | grep -v rc | sort -Vr | head -n1)
-
-
           git checkout "${latest_release}"
+          # https://github.com/pyinstaller/pyinstaller/issues/7692
+          if [[ "${latest_release}" == "v5.11.0" ]]; then
+            git cherry-pick e295cd6855a41d6408b6157b457a0b3bb4ce78e3
+          fi
           # remove pre-compiled bootloaders so we fail if bootloader compile fails
           rm -rvf PyInstaller/bootloader/*-*/*
           cd bootloader