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..8a4f98571 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -34,8 +34,8 @@ jobs:
           projectBaseDir: .
           args: >
             -Dsonar.sources=application,infrastructure,scripts,test,build/docker
-            -Dsonar.organization=nhsd-exeter
-            -Dsonar.projectKey=uec-dos-int
+            -Dsonar.organization=nhsdigital
+            -Dsonar.projectKey=nhsdigital_dos-integration
             -Dsonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py
             -Dsonar.python.coverage.reportPaths=coverage.xml
             -Dsonar.python.version=3.12
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/build/automation/lib/docker.mk b/build/automation/lib/docker.mk
index 07a199ba3..e2b41d783 100644
--- a/build/automation/lib/docker.mk
+++ b/build/automation/lib/docker.mk
@@ -580,7 +580,7 @@ docker-run-sonar-scanner-cli: ### Run sonar-scanner-cli container - mandatory: C
 	mkdir -p $(TMP_DIR)/.sonar/cache
 	image=$$([ -n "$(IMAGE)" ] && echo $(IMAGE) || echo sonarsource/sonar-scanner-cli:$(DOCKER_SONAR_SCANNER_CLI_VERSION))
 	container=$$([ -n "$(CONTAINER)" ] && echo $(CONTAINER) || echo node-$(BUILD_COMMIT_HASH)-$(BUILD_ID)-$$(date --date=$$(date -u +"%Y-%m-%dT%H:%M:%S%z") -u +"%Y%m%d%H%M%S" 2> /dev/null)-$$(make secret-random LENGTH=8))
-	docker run --interactive $(_TTY) --rm \
+	$(DOCKER_CMD) run --interactive $(_TTY) --rm \
 		--name $$container \
 		--user $$(id -u):$$(id -g) \
 		--env-file <(make _list-variables PATTERN="^(AWS|TX|TEXAS|NHSD|TERRAFORM)") \
diff --git a/build/automation/var/project.mk b/build/automation/var/project.mk
index 297f43a26..f1530429f 100644
--- a/build/automation/var/project.mk
+++ b/build/automation/var/project.mk
@@ -1,4 +1,4 @@
-ORG_NAME = nhsd-exeter
+ORG_NAME = NHSDigital
 PROGRAMME = uec
 PROJECT_GROUP = uec/dos
 PROJECT_GROUP_SHORT = uec-dos
@@ -26,7 +26,7 @@ TF_VAR_environment = $(ENVIRONMENT)
 TF_VAR_aws_account_name = $(AWS_ACCOUNT_NAME)
 TF_VAR_deployment_secrets = $(DEPLOYMENT_SECRETS)
 PROJECT_DEPLOYMENT_SECRETS = $(DEPLOYMENT_SECRETS)
-TF_VAR_github_owner = nhsd-exeter
+TF_VAR_github_owner = NHSDigital
 TF_VAR_github_repo = dos-integration
 PARALLEL_TEST_COUNT := $(or $(PARALLEL_TEST_COUNT), auto)
 
@@ -45,7 +45,7 @@ TF_VAR_cicd_blue_green_deployment_pipeline_name := $(PROJECT_ID)-$(ENVIRONMENT)-
 TF_VAR_cicd_shared_resources_deployment_pipeline_name := $(PROJECT_ID)-$(ENVIRONMENT)-cicd-shared-resources-deployment-pipeline
 TF_VAR_blue_green_deployment_new_version_parameter_name := $(PROJECT_ID)-$(ENVIRONMENT)-blue-green-deployment-new-version
 TF_VAR_development_tools_encryption_key_alias := $(PROJECT_ID)-$(ENVIRONMENT)-development-tools-encryption-key
-TF_VAR_github_url := https://github.com/nhsd-exeter/dos-integration.git
+TF_VAR_github_url := https://github.com/NHSDigital/dos-integration.git
 TF_VAR_pipeline_topic_name := $(PROJECT_ID)-$(ENVIRONMENT)-pipeline-topic
 TF_VAR_pipeline_notification_name := $(PROJECT_ID)-$(ENVIRONMENT)-pipeline-notification
 TF_VAR_cicd_blue_green_deployment_pipeline_nofitication_name := $(PROJECT_ID)-$(ENVIRONMENT)-blue-green-pipeline-notification