diff --git a/ci/default-values.yaml b/ci/default-values.yaml
index 726a70b..fff78a1 100644
--- a/ci/default-values.yaml
+++ b/ci/default-values.yaml
@@ -2,14 +2,16 @@
 
 # Use mirror
 # https://code.forgejo.org/forgejo-helm/forgejo-helm/issues/1045
+global:
+  security:
+    allowInsecureImages: true
 redis-cluster:
-  global:
-    imageRegistry: public.ecr.aws
-    security:
-      allowInsecureImages: true
-
+  image:
+    registry: public.ecr.aws
 postgresql-ha:
-  global:
-    imageRegistry: public.ecr.aws
-    security:
-      allowInsecureImages: true
+  postgresql:
+    image:
+      registry: public.ecr.aws
+  pgpool:
+    image:
+      registry: public.ecr.aws
diff --git a/ci/single-values.yaml b/ci/single-values.yaml
index 73ec02b..1077f7a 100644
--- a/ci/single-values.yaml
+++ b/ci/single-values.yaml
@@ -7,10 +7,12 @@ postgresql:
   enabled: true
   # Use mirror
   # https://code.forgejo.org/forgejo-helm/forgejo-helm/issues/1045
-  global:
-    imageRegistry: public.ecr.aws
-    security:
-      allowInsecureImages: true
+  image:
+    registry: public.ecr.aws
+
+global:
+  security:
+    allowInsecureImages: true
 
 persistence:
   enabled: true