diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 6ef07d3..0724f02 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -86,6 +86,24 @@ jobs:
         echo '  make release'
         exit 1
 
+    - name: Upload CodeQL database prep
+      id: codeql-database-bundle
+      env:
+        LANGUAGE: ${{ matrix.language }}
+        CODEQL_PATH: /opt/hostedtoolcache/CodeQL/2.17.1/x64/codeql/codeql
+      run: |
+        CODEQL_DATABASE="/home/runner/work/_temp/codeql_databases/$LANGUAGE"
+        CODEQL_ZIP_OUTPUT="codeql-database-$LANGUAGE.zip"
+        
+        $CODEQL_PATH database bundle $CODEQL_DATABASE --output=$CODEQL_ZIP_OUTPUT
+        echo "::set-output name=zip::$CODEQL_ZIP_OUTPUT"
+
+    - name: Upload CodeQL database
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ matrix.language }}-db
+        path: ${{ steps.codeql-database-bundle.outputs.zip }}
+        
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3
       with: