diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5a05756305043..33d4e1738cd9f 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -46,7 +46,7 @@ jobs:
             ~/.cache/vcpkg
             ~/.ccache
           key: |
-            codeql-analysis-6-${{ hashFiles('vcpkg.json') }}-${{ hashFiles('build/vcpkg/versions/baseline.json') }}
+            codeql-analysis-7-${{ hashFiles('vcpkg.json') }}-${{ hashFiles('ci/gha/builds/vcpkg-overlays/**') }}-${{ hashFiles('build/vcpkg/versions/baseline.json') }}
           restore-keys: |
             codeql-analysis-
       - name: install tools
@@ -68,11 +68,12 @@ jobs:
         run: >
           build/vcpkg/vcpkg install \
             --x-manifest-root . \
+            --overlay-ports ci/gha/builds/vcpkg-overlays \
             --feature-flags=versions \
             --clean-after-build
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4
+        uses: github/codeql-action/init@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4
         with:
           languages: ${{ matrix.language }}
 
@@ -87,9 +88,10 @@ jobs:
         run: >
           cmake -GNinja -S . -B build/output \
             -DCMAKE_TOOLCHAIN_FILE=build/vcpkg/scripts/buildsystems/vcpkg.cmake \
+            -DVCPKG_OVERLAY_PORTS=ci/gha/builds/vcpkg-overlays \
             -DBUILD_TESTING=OFF \
             -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=OFF && \
           cmake --build build/output
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4
+        uses: github/codeql-action/analyze@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4