diff --git a/services/database/postgresql-core/oci-repository.yaml b/services/database/postgresql-core/oci-repository.yaml
index a312ef4..8ba9123 100644
--- a/services/database/postgresql-core/oci-repository.yaml
+++ b/services/database/postgresql-core/oci-repository.yaml
@@ -5,8 +5,8 @@ metadata:
   namespace: database
 spec:
   interval: 5m0s
-  url: oci://ghcr.io/x-evor/postgresql
+  url: oci://ghcr.io/x-evor/charts/postgresql
   ref:
-    semver: "1.1.0"
+    tag: "1.1.0"
   secretRef:
     name: postgresql-ghcr-pull
diff --git a/services/database/postgresql-core/values.yaml b/services/database/postgresql-core/values.yaml
index 72f6242..5292a7c 100644
--- a/services/database/postgresql-core/values.yaml
+++ b/services/database/postgresql-core/values.yaml
@@ -2,7 +2,7 @@ server:
   enabled: true
 
 image:
-  repository: ghcr.io/x-evor/postgresql.svc.plus/postgresql-svc-plus
+  repository: ghcr.io/x-evor/images/postgresql
   tag: "17"
   pullPolicy: IfNotPresent
 
diff --git a/services/database/postgresql/oci-repository.yaml b/services/database/postgresql/oci-repository.yaml
index dbddf49..4359e91 100644
--- a/services/database/postgresql/oci-repository.yaml
+++ b/services/database/postgresql/oci-repository.yaml
@@ -5,9 +5,9 @@ metadata:
   namespace: database
 spec:
   interval: 10m0s
-  url: oci://ghcr.io/x-evor/postgresql
+  url: oci://ghcr.io/x-evor/charts/postgresql
   ref:
-    semver: "1.1.0"
+    tag: "1.1.0"
   layerSelector:
     mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
     operation: copy
diff --git a/services/database/postgresql/stunnel-client-deployment.yaml b/services/database/postgresql/stunnel-client-deployment.yaml
index c272be4..181403b 100644
--- a/services/database/postgresql/stunnel-client-deployment.yaml
+++ b/services/database/postgresql/stunnel-client-deployment.yaml
@@ -22,7 +22,7 @@ spec:
         - name: postgresql-ghcr-pull
       containers:
         - name: stunnel-client
-          image: ghcr.io/x-evor/postgresql.svc.plus/stunnel-client:latest
+          image: ghcr.io/x-evor/images/stunnel-client:latest
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 15432
diff --git a/services/database/postgresql/stunnel-server-deployment.yaml b/services/database/postgresql/stunnel-server-deployment.yaml
index bb46da0..2d9dab0 100644
--- a/services/database/postgresql/stunnel-server-deployment.yaml
+++ b/services/database/postgresql/stunnel-server-deployment.yaml
@@ -17,7 +17,7 @@ spec:
         - name: postgresql-ghcr-pull
       containers:
         - name: stunnel-server
-          image: ghcr.io/x-evor/postgresql.svc.plus/stunnel-server:latest
+          image: ghcr.io/x-evor/images/stunnel-server:latest
           imagePullPolicy: IfNotPresent
           command: ["stunnel", "/etc/stunnel/stunnel.conf"]
           ports:
diff --git a/services/database/postgresql/values.yaml b/services/database/postgresql/values.yaml
index 8e1700d..413c6bf 100644
--- a/services/database/postgresql/values.yaml
+++ b/services/database/postgresql/values.yaml
@@ -2,7 +2,7 @@ server:
   enabled: true
 
 image:
-  repository: ghcr.io/x-evor/postgresql.svc.plus/postgresql-svc-plus
+  repository: ghcr.io/x-evor/images/postgresql
   tag: "17"
   pullPolicy: IfNotPresent
 
@@ -54,7 +54,7 @@ stunnel:
 stunnelClient:
   enabled: false
   image:
-    repository: ghcr.io/x-evor/postgresql.svc.plus/stunnel-client
+    repository: ghcr.io/x-evor/images/stunnel-client
     tag: latest
     pullPolicy: IfNotPresent
   service:
diff --git a/services/database/stunnel-server/stunnel-server-deployment.yaml b/services/database/stunnel-server/stunnel-server-deployment.yaml
index 1f53ebb..c0fb3df 100644
--- a/services/database/stunnel-server/stunnel-server-deployment.yaml
+++ b/services/database/stunnel-server/stunnel-server-deployment.yaml
@@ -16,7 +16,7 @@ spec:
         - name: postgresql-ghcr-pull
       containers:
         - name: stunnel-server
-          image: ghcr.io/x-evor/postgresql.svc.plus/stunnel-server:latest
+          image: ghcr.io/x-evor/images/stunnel-server:latest
           imagePullPolicy: IfNotPresent
           command: ["stunnel", "/etc/stunnel/stunnel.conf"]
           ports:
diff --git a/services/stunnel-client/base/stunnel-client-deployment.yaml b/services/stunnel-client/base/stunnel-client-deployment.yaml
index 640014f..0e2da62 100644
--- a/services/stunnel-client/base/stunnel-client-deployment.yaml
+++ b/services/stunnel-client/base/stunnel-client-deployment.yaml
@@ -16,7 +16,7 @@ spec:
         - name: postgresql-ghcr-pull
       containers:
         - name: stunnel-client
-          image: ghcr.io/x-evor/postgresql.svc.plus/stunnel-client:latest
+          image: ghcr.io/x-evor/images/stunnel-client:latest
           imagePullPolicy: IfNotPresent
           command: ["stunnel", "/etc/stunnel/stunnel.conf"]
           ports: