diff --git a/.ci/deploy-windows-clang-cl.sh b/.ci/deploy-windows-clang-cl.sh
index 2e8f556342..d3111c5f80 100644
--- a/.ci/deploy-windows-clang-cl.sh
+++ b/.ci/deploy-windows-clang-cl.sh
@@ -1,5 +1,9 @@
 #!/bin/sh -ex
 
+# source ci-vars.env
+# shellcheck disable=SC1091
+. .ci/ci-vars.env
+
 cd build || exit 1
 
 CPU_ARCH="${1:-x86_64}"
diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml
index 0aec16870b..adfde89e45 100644
--- a/.github/workflows/rpcs3.yml
+++ b/.github/workflows/rpcs3.yml
@@ -434,7 +434,7 @@ jobs:
           path: |
             vcpkg/installed
             vcpkg/buildtrees
-          key: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}-${{ github.run_id }}
+          key: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}-16248552313
           restore-keys: vcpkg-${{ runner.os }}-${{ matrix.compiler }}-${{ runner.arch }}-
 
       - name: Install dependencies with vcpkg
@@ -475,7 +475,7 @@ jobs:
         id: restore-build-ccache
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-${{ github.run_id }}
+          key: ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-16248552313
           restore-keys: ${{ runner.os }}-ccache-${{ matrix.compiler }}-${{ runner.arch }}-
 
       - name: Setup CI Variables