diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index df1e40d3f0..4d667ec893 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -23,7 +23,6 @@ jobs:
     runs-on: "ubuntu-latest"
     timeout-minutes: 360
     permissions:
-      # required for all workflows
       security-events: write
 
     strategy:
@@ -32,37 +31,20 @@ jobs:
         include:
         - language: c-cpp
           build-mode: manual
+          manual-build-command: pip install -e .
         - language: python
           build-mode: none
         - language: actions
           build-mode: none
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v7.0.0
+    - uses: mongodb-labs/drivers-github-tools/codeql@95f9ce909bf0e44707fffdb92c18ed86e74aa2fd # v3
       with:
-        ref: ${{ inputs.ref }}
-        persist-credentials: false
-    - uses: actions/setup-python@v6
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
-      with:
-        languages: ${{ matrix.language }}
+        language: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        queries: security-extended
+        manual-build-command: ${{ matrix.manual-build-command }}
+        ref: ${{ inputs.ref }}
         config: |
           paths-ignore:
             - 'doc/**'
             - 'tools/**'
             - 'test/**'
-
-    - if: matrix.build-mode == 'manual'
-      run: |
-        pip install -e .
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
-      with:
-        category: "/language:${{matrix.language}}"