diff --git a/databases/postgresql/stunnel-server-deployment.yaml b/databases/postgresql/stunnel-server-deployment.yaml
index 21ee247..0a28f86 100644
--- a/databases/postgresql/stunnel-server-deployment.yaml
+++ b/databases/postgresql/stunnel-server-deployment.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: stunnel-server
-          image: ghcr.io/x-evor/postgresql.svc.plus/stunnel-server:2330d36
+          image: dweomer/stunnel:latest
           imagePullPolicy: IfNotPresent
           command: ["stunnel", "/etc/stunnel/stunnel.conf"]
           ports:
diff --git a/databases/postgresql/values.yaml b/databases/postgresql/values.yaml
index 26405e3..76042a0 100644
--- a/databases/postgresql/values.yaml
+++ b/databases/postgresql/values.yaml
@@ -2,8 +2,8 @@ server:
   enabled: true
 
 image:
-  repository: ghcr.io/x-evor/postgresql.svc.plus/postgres-extensions
-  tag: latest
+  repository: postgres
+  tag: "17.9"
   pullPolicy: IfNotPresent
 
 auth:
@@ -51,7 +51,7 @@ stunnel:
 stunnelClient:
   enabled: false
   image:
-    repository: ghcr.io/x-evor/postgresql.svc.plus/stunnel-client
+    repository: dweomer/stunnel
     tag: latest
     pullPolicy: IfNotPresent
   service: