diff --git a/.github/workflows/cicd-dotnet.yml b/.github/workflows/cicd-dotnet.yml
index 1fb74f7..00de00e 100644
--- a/.github/workflows/cicd-dotnet.yml
+++ b/.github/workflows/cicd-dotnet.yml
@@ -132,10 +132,12 @@ jobs:
 
   build:
     name: Build
+    if: ${{ !cancelled() && !failure() }}
     uses: ./.github/workflows/step-dotnet-build.yml
     needs:
       - tests
       - format
+      - codeql
     with:
       disablePublish: ${{ inputs.disablePublish || false }}
       dotnet-logging: ${{ inputs.dotnet-logging || 'quiet' }}
@@ -151,7 +153,6 @@ jobs:
     uses: ./.github/workflows/step-dependabot-merge.yml
     needs:
       - build
-      - codeql
     secrets: inherit
 
   publish-nuget:
@@ -160,7 +161,6 @@ jobs:
     uses: ./.github/workflows/step-dotnet-publish-nuget.yml
     needs:
       - build
-      - codeql
     secrets: inherit
 
   release:
@@ -169,7 +169,6 @@ jobs:
     needs:
       - version
       - build
-      - codeql
       - publish-nuget
     uses: ./.github/workflows/step-dotnet-draft-release.yml
     with:
diff --git a/.github/workflows/local-pr-testprojects.yml b/.github/workflows/local-pr-testprojects.yml
index d667f6b..b800d19 100644
--- a/.github/workflows/local-pr-testprojects.yml
+++ b/.github/workflows/local-pr-testprojects.yml
@@ -11,6 +11,7 @@ jobs:
     with:
       enableCleanUpDockerDocker: true
       enableSonarQube: false
+      disableCodeQL: true
       dotnet-version: ${{ vars.NE_DOTNET_TARGETFRAMEWORKS }}
       dotnet-quality: ${{ vars.NE_DOTNET_QUALITY }}
       solution: ./testprojects/HealthChecks.sln