diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a23392d6..8d9d17b1a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,8 +37,7 @@ jobs:
               run: |
                 npm run unit-test
 
-            - name: Analyse code quality (pull_request)
-              if: github.event_name == 'pull_request'
+            - name: Analyse code quality
               uses: sonarsource/sonarqube-scan-action@master
               env:
                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -47,26 +46,10 @@ jobs:
                 args: >
                   -Dsonar.organization=defra
                   -Dsonar.projectKey=DEFRA_flood-app
+                  -Dsonar.sources=server
+                  -Dsonar.tests=server
+                  -Dsonar.test.inclusions=**/test/**
                   -Dsonar.exclusions=**/node_modules/**,**/test/**,**/test-output/**
                   -Dsonar.javascript.lcov.reportPaths=coverage/lcov.info
                   -Dsonar.javascript.exclusions=**/node_modules/**,**/test/**,**/test-output/**,**/mock/**,**/server/dist/**,**/server/src/**,**/service-down/**
                   -Dsonar.coverage.exclusions=**/server/routes/status.js
-                  -Dsonar.pullrequest.key=${{ github.event.pull_request.number }}
-                  -Dsonar.pullrequest.branch=${{ github.head_ref }}
-                  -Dsonar.pullrequest.base=${{ github.base_ref }}
-
-            - name: Analyse code quality (non-PR)
-              if: github.event_name != 'pull_request'
-              uses: sonarsource/sonarqube-scan-action@master
-              env:
-                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-              with:
-                args: >
-                  -Dsonar.organization=defra
-                  -Dsonar.projectKey=DEFRA_flood-app
-                  -Dsonar.exclusions=**/node_modules/**,**/test/**,**/test-output/**
-                  -Dsonar.javascript.lcov.reportPaths=coverage/lcov.info
-                  -Dsonar.javascript.exclusions=**/node_modules/**,**/test/**,**/test-output/**,**/mock/**,**/server/dist/**,**/server/src/**,**/service-down/**
-                  -Dsonar.coverage.exclusions=**/server/routes/status.js
-                  -Dsonar.branch.name=${{ github.ref_name }}