diff --git a/Azure_Pipelines/azure-pipelines.account.cd.yaml b/Azure_Pipelines/azure-pipelines.account.cd.yaml
index aa2ade50f..51fe16c0c 100644
--- a/Azure_Pipelines/azure-pipelines.account.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.account.cd.yaml
@@ -28,6 +28,9 @@ variables:
   value: 'link-account'
 - name: dockerPath
   value: '**/Account/Dockerfile'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
+  
 steps:
   - template: ../azure-nuget-package-source.yml
   - task: DotNetCoreCLI@2
@@ -55,7 +58,7 @@ steps:
     displayName: "Build & Push Account Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.audit.cd.yaml b/Azure_Pipelines/azure-pipelines.audit.cd.yaml
index eaa1b64f7..9cf5c7397 100644
--- a/Azure_Pipelines/azure-pipelines.audit.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.audit.cd.yaml
@@ -28,6 +28,8 @@ variables:
   value: '**/Audit/Dockerfile'
 - name: serviceName
   value: 'Audit'  
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push Audit Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.census.cd.yaml b/Azure_Pipelines/azure-pipelines.census.cd.yaml
index de3a68938..abd46530d 100644
--- a/Azure_Pipelines/azure-pipelines.census.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.census.cd.yaml
@@ -28,6 +28,8 @@ variables:
   value: '**/Census/Dockerfile'
 - name: serviceName
   value: 'Census'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
   
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push Census Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.dataacquisition.cd.yaml b/Azure_Pipelines/azure-pipelines.dataacquisition.cd.yaml
index c0cf50645..e675eb1ea 100644
--- a/Azure_Pipelines/azure-pipelines.dataacquisition.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.dataacquisition.cd.yaml
@@ -28,6 +28,8 @@ variables:
   value: '**/DataAcquisition/Dockerfile'
 - name: serviceName
   value: 'DataAcquisition'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push DataAcquisition Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.gateway.cd.yaml b/Azure_Pipelines/azure-pipelines.gateway.cd.yaml
index 708d53996..7efc67b2c 100644
--- a/Azure_Pipelines/azure-pipelines.gateway.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.gateway.cd.yaml
@@ -17,6 +17,7 @@ variables:
     $(Build.BuildId)
   registry-repo-Name: 'link-api-gw'
   dockerPath: '**/DemoApiGateway/Dockerfile'
+  containerRegistry: 'NHSNLink ACR Premium'
 
 steps:
   - task: PowerShell@2
@@ -73,7 +74,7 @@ steps:
     displayName: "Build & Push DemoApiGateway Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.measureeval.cd.yaml b/Azure_Pipelines/azure-pipelines.measureeval.cd.yaml
index f8719e427..a2edf50b7 100644
--- a/Azure_Pipelines/azure-pipelines.measureeval.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.measureeval.cd.yaml
@@ -28,6 +28,8 @@ variables:
   value: '**/MeasureEval/Dockerfile'
 - name: serviceName
   value: 'MeasureEval'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push MeasureEval Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.normalization.cd.yaml b/Azure_Pipelines/azure-pipelines.normalization.cd.yaml
index 8edb636b0..8714ff53f 100644
--- a/Azure_Pipelines/azure-pipelines.normalization.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.normalization.cd.yaml
@@ -28,6 +28,8 @@ variables:
   value: '**/Normalization/Dockerfile'
 - name: serviceName
   value: 'Normalization'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push Normalization Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.notification.cd.yaml b/Azure_Pipelines/azure-pipelines.notification.cd.yaml
index 197be68a9..7c1c744f2 100644
--- a/Azure_Pipelines/azure-pipelines.notification.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.notification.cd.yaml
@@ -28,6 +28,8 @@ variables:
   value: '**/Notification/Dockerfile'
 - name: serviceName
   value: 'Notification'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push Notification Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.patientbundlepermeasure.cd.yaml b/Azure_Pipelines/azure-pipelines.patientbundlepermeasure.cd.yaml
deleted file mode 100644
index ce604463f..000000000
--- a/Azure_Pipelines/azure-pipelines.patientbundlepermeasure.cd.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-trigger:
-  branches:
-    include:
-    - master
-  paths:
-    include:
-    - PatientBundlePerMeasure/*
-pr: none
-
-pool:
-  vmImage: 'ubuntu-latest'
-
-variables:
-- group: Link_BOTW_Build_Package_Variables
-- name: project
-  value: 'PatientBundlePerMeasure/PatientBundlePerMeasure.csproj'
-- name: testProject
-  value: 'PatientBundlePerMeasureUnitTests/PatientBundlePerMeasureUnitTests.csproj'
-- name: nugetPath
-  value: 'PatientBundlePerMeasure/nuget.config'
-- name: tags1
-  value: 'latest'
-- name: tags2
-  value: '$(Build.BuildId)'
-- name: registry-repo-Name
-  value: 'link-patientbundle'
-- name: dockerPath
-  value: '**/PatientBundlePerMeasure/Dockerfile'
-- name: serviceName
-  value: 'PatientBundlePerMeasure'
-
-steps:
-  - template: ../azure-nuget-package-source.yml
-  
-  - task: DotNetCoreCLI@2
-    displayName: Restore
-    inputs:
-      command: restore
-      projects: '$(project)'
-      nugetConfigPath: '$(nugetPath)'
-      feedsToUse: config
-  
-  - task: DotNetCoreCLI@2
-    displayName: Build
-    inputs:
-      command: build
-      projects: '$(project)'
-
-  - task: DotNetCoreCLI@2
-    inputs:
-      command: 'test'
-      projects: $(testProject)'
-    displayName: 'Run Tests'
-  
-
-  - task: Docker@2
-    displayName: "Build & Push Account Docker Image"
-    condition: always()
-    inputs:
-      containerRegistry: 'Link ACR'
-      repository: $(registry-repo-name)
-      command: 'buildAndPush'
-      Dockerfile: $(dockerPath)
-      tags: |
-        $(tags1)
-        $(tags2)
-      buildContext: '$(Build.Repository.LocalPath)'
-
-  - task: PublishPipelineArtifact@1
-    inputs:
-      targetPath: '$(Build.ArtifactStagingDirectory)'
-      artifact: 'manifest'
diff --git a/Azure_Pipelines/azure-pipelines.patientbundlepermeasure.ci.yaml b/Azure_Pipelines/azure-pipelines.patientbundlepermeasure.ci.yaml
deleted file mode 100644
index dbf4636b1..000000000
--- a/Azure_Pipelines/azure-pipelines.patientbundlepermeasure.ci.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-trigger:
-  paths:
-    include:
-    - PatientBundlePerMeasure/*
-
-pool:
-  vmImage: 'ubuntu-latest'
-
-variables:
-  project: 'PatientBundlePerMeasure/PatientBundlePerMeasure.csproj'
-  testProject: 'PatientBundlePerMeasureUnitTests/PatientBundlePerMeasureUnitTests.csproj'
-  nugetPath: 'PatientBundlePerMeasure/nuget.config'
-  serviceName: 'PatientBundlePerMeasure'
-
-steps:
-  - template: ../azure-nuget-package-source.yml 
-
-  - task: DotNetCoreCLI@2
-    displayName: Restore
-    inputs:
-      command: restore
-      projects: '$(project)'
-      nugetConfigPath: '$(nugetPath)'
-      feedsToUse: config
-  
-  - task: DotNetCoreCLI@2
-    displayName: Build
-    inputs:
-      command: build
-      projects: '$(project)'
-
-  - task: DotNetCoreCLI@2
-    inputs:
-      command: 'test'
-      projects: $(testProject)
-    displayName: 'Run Tests'
-
diff --git a/Azure_Pipelines/azure-pipelines.patientlist.cd.yaml b/Azure_Pipelines/azure-pipelines.patientlist.cd.yaml
index c6f18ae8e..82e2b3011 100644
--- a/Azure_Pipelines/azure-pipelines.patientlist.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.patientlist.cd.yaml
@@ -28,6 +28,8 @@ variables:
   value: '**/PatientList/Dockerfile'
 - name: serviceName
   value: 'PatientList'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push PatientList Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.patientstoquery.cd.yaml b/Azure_Pipelines/azure-pipelines.patientstoquery.cd.yaml
index 325810438..d6166910d 100644
--- a/Azure_Pipelines/azure-pipelines.patientstoquery.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.patientstoquery.cd.yaml
@@ -28,6 +28,8 @@ variables:
   value: '**/PatientsToQuery/Dockerfile'
 - name: serviceName
   value: 'PatientsToQuery'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push Account Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.querydispatch.cd.yaml b/Azure_Pipelines/azure-pipelines.querydispatch.cd.yaml
index 2fa3ae485..42c0721d3 100644
--- a/Azure_Pipelines/azure-pipelines.querydispatch.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.querydispatch.cd.yaml
@@ -28,6 +28,8 @@ variables:
   value: '**/QueryDispatch/Dockerfile'
 - name: serviceName
   value: 'QueryDispatch'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push QueryDispatch Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.report.cd.yaml b/Azure_Pipelines/azure-pipelines.report.cd.yaml
index e227986c3..b70c5f408 100644
--- a/Azure_Pipelines/azure-pipelines.report.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.report.cd.yaml
@@ -28,6 +28,9 @@ variables:
   value: '**/Report/Dockerfile'
 - name: serviceName
   value: 'Report'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
+  
 steps:
   - template: ../azure-nuget-package-source.yml
 
@@ -56,7 +59,7 @@ steps:
     displayName: "Build & Push Report Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.submission.cd.yaml b/Azure_Pipelines/azure-pipelines.submission.cd.yaml
index eed8c3850..1bf498d72 100644
--- a/Azure_Pipelines/azure-pipelines.submission.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.submission.cd.yaml
@@ -28,6 +28,8 @@ variables:
   value: '**/Submission/Dockerfile'
 - name: serviceName
   value: 'Submission'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -56,7 +58,7 @@ steps:
     displayName: "Build & Push Account Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.tenant.cd.yaml b/Azure_Pipelines/azure-pipelines.tenant.cd.yaml
index ba2d256c0..586556bb1 100644
--- a/Azure_Pipelines/azure-pipelines.tenant.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.tenant.cd.yaml
@@ -28,6 +28,9 @@ variables:
   value: '**/Tenant/Dockerfile'
 - name: serviceName
   value: 'Tenant'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
+  
 steps:
   - template: ../azure-nuget-package-source.yml
 
@@ -56,7 +59,7 @@ steps:
     displayName: "Build & Push Tenant Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)
diff --git a/Azure_Pipelines/azure-pipelines.validation.cd.yaml b/Azure_Pipelines/azure-pipelines.validation.cd.yaml
index 533dab9fe..c95e31b1e 100644
--- a/Azure_Pipelines/azure-pipelines.validation.cd.yaml
+++ b/Azure_Pipelines/azure-pipelines.validation.cd.yaml
@@ -28,6 +28,8 @@ variables:
   value: '**/Validation/Dockerfile'
 - name: serviceName
   value: 'Validation'
+- name: containerRegistry
+  value: 'NHSNLink ACR Premium'
 
 steps:
   - template: ../azure-nuget-package-source.yml
@@ -57,7 +59,7 @@ steps:
     displayName: "Build & Push Validation Docker Image"
     condition: always()
     inputs:
-      containerRegistry: 'Link ACR'
+      containerRegistry: $(containerRegistry)
       repository: $(registry-repo-name)
       command: 'buildAndPush'
       Dockerfile: $(dockerPath)