diff --git a/.github/workflows/ngwpc-cicd.yml b/.github/workflows/ngwpc-cicd.yml
index b879c5228d..bac07342e0 100644
--- a/.github/workflows/ngwpc-cicd.yml
+++ b/.github/workflows/ngwpc-cicd.yml
@@ -55,7 +55,7 @@ jobs:
   build:
     name: build
     if: github.event_name == 'pull_request' || github.event_name == 'push'
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     needs: setup
     steps:
       - uses: actions/checkout@v4
@@ -110,25 +110,25 @@ jobs:
           }
 
   # SonarQube scan (only runs on internal NGWPC self-hosted runners)
-  sonarqube-internal:
-    name: sonarqube-internal
-    if: (github.event_name == 'pull_request' || github.event_name == 'push') && github.repository_owner == 'NGWPC'
-    runs-on: self-hosted
-    needs: [setup, build, unit-test]
-    #TODO: Configure SonarQube Scans
-    continue-on-error: true
-    container:
-      image: sonarsource/sonar-scanner-cli
-      options: --entrypoint="" --user 0
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: SonarQube Scan
-        env:
-          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: sonar-scanner -X -Dsonar.verbose=true
+  #sonarqube-internal:
+  #  name: sonarqube-internal
+  #  if: (github.event_name == 'pull_request' || github.event_name == 'push') && github.repository_owner == 'NGWPC'
+  #  runs-on: self-hosted
+  #  needs: [setup, build, unit-test]
+  #  #TODO: Configure SonarQube Scans
+  #  continue-on-error: true
+  #  container:
+  #    image: sonarsource/sonar-scanner-cli
+  #    options: --entrypoint="" --user 0
+  #  steps:
+  #    - uses: actions/checkout@v4
+  #      with:
+  #        fetch-depth: 0
+  #    - name: SonarQube Scan
+  #      env:
+  #        SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+  #        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  #      run: sonar-scanner -X -Dsonar.verbose=true
 
   # CodeQL scan
   # TODO: Update to scan as desired.
@@ -197,6 +197,7 @@ jobs:
           template: '@/contrib/sarif.tpl'
           output: 'trivy-results.sarif'
           severity: 'CRITICAL,HIGH'
+          timeout: 15m
       - name: Upload Trivy results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@v3
         with:
@@ -206,7 +207,7 @@ jobs:
     name: deploy-latest-on-development
     if: github.event_name == 'push' && github.ref_name == 'development'
     runs-on: ubuntu-latest
-    needs: [setup, build, unit-test, sonarqube-internal, codeql-scan, container-scanning]
+    needs: [setup, build, unit-test, codeql-scan, container-scanning]
     steps:
       - name: Tag image with 'latest'
         shell: bash