diff --git a/java/Chart.yaml b/java/Chart.yaml
index 45889a5..4e7cefe 100644
--- a/java/Chart.yaml
+++ b/java/Chart.yaml
@@ -20,5 +20,5 @@ dependencies:
     repository: oci://hmctspublic.azurecr.io/helm
   - name: postgresql
     version: 15.2.4
-    repository: https://charts.bitnami.com/bitnami
+    repository: oci://registry-1.docker.io/bitnamicharts
     condition: postgresql.enabled
diff --git a/java/values.yaml b/java/values.yaml
index a65d2dc..74e1c47 100644
--- a/java/values.yaml
+++ b/java/values.yaml
@@ -64,6 +64,18 @@ postgresql:
   primary:
     persistence:
       enabled: false
+  ## Override metrics image for postgresql-exporter
+  metrics:
+    image:
+      registry: hmctspublic.azurecr.io
+      repository: imported/bitnami/postgres-exporter
+      tag: '0.15.0-debian-12-r16'
+  ## Override volume permissions image for os-shell
+  volumePermissions:
+    image:
+      registry: hmctspublic.azurecr.io
+      repository: imported/bitnami/os-shell
+      tag: '12-debian-12-r18'
 
 global:
   enableKeyVaults: false