diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5aa0e4e0c..9d6ee79db 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
-/.github @nhsd-exeter/maintainers
-/build/automation/lib @nhsd-exeter/maintainers
-/build/automation/init.mk @nhsd-exeter/maintainers
-/.gitignore @nhsd-exeter/maintainers
-/project.code-workspace @nhsd-exeter/maintainers
+/.github @NHSDigital/data-sourcing-ftrs/maintainers
+/build/automation/lib @NHSDigital/data-sourcing-ftrs/maintainers
+/build/automation/init.mk @NHSDigital/data-sourcing-ftrs/maintainers
+/.gitignore @NHSDigital/data-sourcing-ftrs/maintainers
+/project.code-workspace @NHSDigital/data-sourcing-ftrs/maintainers
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index 797e5f3e0..610592d72 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -25,22 +25,19 @@ jobs:
       - name: Check Python Unit Test Coverage
         run: |
           make coverage-report
-      - uses: sonarsource/sonarcloud-github-action@master
-        # SEE: https://github.com/SonarSource/sonarcloud-github-action
+      - name: Perform SonarCloud static analysis
+        uses: sonarsource/sonarqube-scan-action@v5.2.0
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         with:
-          projectBaseDir: .
           args: >
-            -Dsonar.sources=application,infrastructure,scripts,test,build/docker
-            -Dsonar.organization=nhsd-exeter
-            -Dsonar.projectKey=uec-dos-int
-            -Dsonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py
+            -Dsonar.organization=${{ vars.SONAR_ORGANISATION_KEY }}
+            -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }}
+            -Dsonar.branch.name=${{ github.ref_name }}
             -Dsonar.python.coverage.reportPaths=coverage.xml
             -Dsonar.python.version=3.12
-            -Dsonar.exclusions=application/**/tests/**
-
+            -Dproject.settings=./scripts/config/sonar-scanner.properties
+        continue-on-error: true # quick toggle to disable sonar-cloud if down
   check-markdown-code-quality:
     runs-on: ubuntu-latest
     steps:
diff --git a/Makefile b/Makefile
index be1b8d23a..a57b05359 100644
--- a/Makefile
+++ b/Makefile
@@ -272,7 +272,7 @@ tag-commit-to-destroy-environment: # Tag git commit to destroy deployment - mand
 	fi
 
 get-environment-from-pr:
-	ENVIRONMENT=$$(gh pr list -s merged --json number,mergeCommit,headRefName --repo=nhsd-exeter/dos-integration |  jq --raw-output '.[] | select(.number == $(PR_NUMBER)) | .headRefName | sub( ".*:*/DS-(?<x>.[0-9]*).*"; "ds-\(.x)") ')
+	ENVIRONMENT=$$(gh pr list -s merged --json number,mergeCommit,headRefName --repo=NHSDigital/dos-integration |  jq --raw-output '.[] | select(.number == $(PR_NUMBER)) | .headRefName | sub( ".*:*/DS-(?<x>.[0-9]*).*"; "ds-\(.x)") ')
 	echo $$ENVIRONMENT
 
 is-environment-deployed:
diff --git a/README.md b/README.md
index 2d3c0e795..2c1b6733c 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,7 @@ The main components you will need for _basic_ development work, are your OS vers
 
 Clone the repository
 
-    git clone git@github.com:nhsd-exeter/dos-integration.git
+    git clone git@github.com:NHSDigital/dos-integration.git
     cd ./dos-integration
 
 ### AWS Authentication
diff --git a/scripts/config/sonar-scanner.properties b/scripts/config/sonar-scanner.properties
new file mode 100644
index 000000000..9fd6dfe38
--- /dev/null
+++ b/scripts/config/sonar-scanner.properties
@@ -0,0 +1,6 @@
+sonar.host.url=https://sonarcloud.io
+sonar.qualitygate.wait=true
+sonar.sourceEncoding=UTF-8
+sonar.sources=application,infrastructure,scripts,test,build/docker
+sonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py
+sonar.exclusions=application/**/tests/**