diff --git a/Dockerfile b/Dockerfile
index c0806fb6d..24352744c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ ARG JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom"
 ARG APP_INSIGHTS_AGENT_VERSION=3.7.3
 ARG PLATFORM=""
 
-FROM hmctspublic.azurecr.io/base/java${PLATFORM}:21-distroless
+FROM hmctsprod.azurecr.io/base/java${PLATFORM}:21-distroless
 
 # Change to non-root privilege
 USER hmcts
diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP
index 88ad0852b..11b38ddcc 100644
--- a/Jenkinsfile_CNP
+++ b/Jenkinsfile_CNP
@@ -82,8 +82,8 @@ env.PACT_BROKER_URL = "pact-broker.platform.hmcts.net"
 env.PACT_BROKER_PORT = "443"
 env.PACT_BROKER_SCHEME = "https"
 
-// Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctspublic ACR
-env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctspublic.azurecr.io/imported/"
+// Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctsprod ACR
+env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctsprod.azurecr.io/imported/"
 
 withPipeline("java", product, component) {
   onMaster {
diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly
index c345cfae8..fbd255271 100644
--- a/Jenkinsfile_nightly
+++ b/Jenkinsfile_nightly
@@ -12,8 +12,8 @@ def type = "java"
 def product = "ccd"
 def component = "case-document-am-api"
 
-// Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctspublic ACR
-env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctspublic.azurecr.io/imported/"
+// Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctsprod ACR
+env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctsprod.azurecr.io/imported/"
 
 withNightlyPipeline(type, product, component) {
   enableSlackNotifications('#ccd-case-document-am-api-builds')
diff --git a/acb.tpl.yaml b/acb.tpl.yaml
index 1f6f007cc..9ff709dd4 100644
--- a/acb.tpl.yaml
+++ b/acb.tpl.yaml
@@ -1,14 +1,14 @@
 version: 1.0-preview-1
 steps:
   - id: pull-base-image-amd64
-    cmd: docker pull --platform linux/amd64 hmctspublic.azurecr.io/base/java:21-distroless && docker tag hmctspublic.azurecr.io/base/java:21-distroless hmctspublic.azurecr.io/base/java/linux/amd64:21-distroless
+    cmd: docker pull --platform linux/amd64 hmctsprod.azurecr.io/base/java:21-distroless && docker tag hmctsprod.azurecr.io/base/java:21-distroless hmctsprod.azurecr.io/base/java/linux/amd64:21-distroless
     when: ["-"]
     retries: 3
     retryDelay: 5
 
   - id: runtime-amd64
     build: >
-      -t {{.Run.Registry}}/{{CI_IMAGE_TAG}}-amd64
+      -t hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-amd64
       --build-arg PLATFORM=/linux/amd64
       --platform linux/amd64
       .
@@ -18,7 +18,7 @@ steps:
     retryDelay: 5
 
   - id: pull-base-image-arm64
-    cmd: docker pull --platform linux/arm64 hmctspublic.azurecr.io/base/java:21-distroless && docker tag hmctspublic.azurecr.io/base/java:21-distroless hmctspublic.azurecr.io/base/java/linux/arm64:21-distroless
+    cmd: docker pull --platform linux/arm64 hmctsprod.azurecr.io/base/java:21-distroless && docker tag hmctsprod.azurecr.io/base/java:21-distroless hmctsprod.azurecr.io/base/java/linux/arm64:21-distroless
     when:
       - pull-base-image-amd64
     retries: 3
@@ -26,7 +26,7 @@ steps:
 
   - id: runtime-arm64
     build: >
-      -t {{.Run.Registry}}/{{CI_IMAGE_TAG}}-arm64
+      -t hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-arm64
       --build-arg PLATFORM=/linux/arm64
       --platform linux/arm64/v8
       .
@@ -37,8 +37,8 @@ steps:
 
   - id: push-images
     push:
-      - "{{.Run.Registry}}/{{CI_IMAGE_TAG}}-amd64"
-      - "{{.Run.Registry}}/{{CI_IMAGE_TAG}}-arm64"
+      - "hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-amd64"
+      - "hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-arm64"
     when:
       - runtime-amd64
       - runtime-arm64
@@ -46,14 +46,14 @@ steps:
     retryDelay: 5
 
   - id: manifest-create
-    cmd: docker manifest create {{.Run.Registry}}/{{CI_IMAGE_TAG}} {{.Run.Registry}}/{{CI_IMAGE_TAG}}-amd64 {{.Run.Registry}}/{{CI_IMAGE_TAG}}-arm64
+    cmd: docker manifest create hmctsprod.azurecr.io/{{CI_IMAGE_TAG}} hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-amd64 hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}-arm64
     when:
       - push-images
     retries: 3
     retryDelay: 5
 
   - id: manifest-push
-    cmd: docker manifest push --purge {{.Run.Registry}}/{{CI_IMAGE_TAG}}
+    cmd: docker manifest push --purge hmctsprod.azurecr.io/{{CI_IMAGE_TAG}}
     when:
       - manifest-create
     retries: 3
diff --git a/charts/ccd-case-document-am-api/Chart.yaml b/charts/ccd-case-document-am-api/Chart.yaml
index 9bf45a111..1901ad8eb 100644
--- a/charts/ccd-case-document-am-api/Chart.yaml
+++ b/charts/ccd-case-document-am-api/Chart.yaml
@@ -3,10 +3,10 @@ appVersion: "1.0"
 description: A Helm chart for CCD Case Document AM API
 name: ccd-case-document-am-api
 home: https://github.com/hmcts/ccd-case-document-am-api
-version: 1.7.17
+version: 1.7.18
 maintainers:
   - name: CCD Team
 dependencies:
   - name: java
     version: 5.3.0
-    repository: 'oci://hmctspublic.azurecr.io/helm'
+    repository: 'oci://hmctsprod.azurecr.io/helm'
diff --git a/charts/ccd-case-document-am-api/values.yaml b/charts/ccd-case-document-am-api/values.yaml
index 3054adfc1..73251a12d 100644
--- a/charts/ccd-case-document-am-api/values.yaml
+++ b/charts/ccd-case-document-am-api/values.yaml
@@ -1,5 +1,5 @@
 java:
-  image: 'hmctspublic.azurecr.io/ccd/case-document-am-api:latest'
+  image: 'hmctsprod.azurecr.io/ccd/case-document-am-api:latest'
   ingressHost: ccd-case-document-am-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
   applicationPort: 4455
   aadIdentityName: ccd