diff --git a/postgrecluster/docker-compose.yml b/postgrecluster/docker-compose.yml
index 509035a..7b3c9b8 100644
--- a/postgrecluster/docker-compose.yml
+++ b/postgrecluster/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   etcd:
-    image: bitnami/etcd:latest
+    image: quay.io/coreos/etcd:v3.5.17
     restart: unless-stopped
     environment:
       - ETCD_NAME=${NODE_NAME}
@@ -11,33 +11,31 @@ services:
       - ETCD_INITIAL_CLUSTER=node1=http://${NODE1_IP}:2380,node2=http://${NODE2_IP}:2380,node3=http://${NODE3_IP}:2380
       - ETCD_INITIAL_CLUSTER_STATE=new
       - ETCD_INITIAL_CLUSTER_TOKEN=patroni-cluster
-      - ALLOW_NONE_AUTHENTICATION=yes
+      - ETCD_DATA_DIR=/etcd-data
     ports:
       - "2379:2379"
       - "2380:2380"
     volumes:
-      - /data/compose/postgrecluster/etcd_data:/bitnami/etcd
+      - /data/compose/postgrecluster/etcd_data:/etcd-data
 
   patroni:
-    image: patroni/patroni:latest
+    image: ghcr.io/zalando/spilo-17:4.0-p3
     restart: unless-stopped
     environment:
+      - SCOPE=authentik-cluster
+      - PGVERSION=17
+      - SPILO_PROVIDER=local
+      - POD_IP=${NODE_IP}
       - PATRONI_NAME=${NODE_NAME}
-      - PATRONI_POSTGRESQL_LISTEN=0.0.0.0:5432
-      - PATRONI_POSTGRESQL_CONNECT_ADDRESS=${NODE_IP}:5432
-      - PATRONI_RESTAPI_LISTEN=0.0.0.0:8008
-      - PATRONI_RESTAPI_CONNECT_ADDRESS=${NODE_IP}:8008
-      - PATRONI_ETCD3_HOSTS=${NODE1_IP}:2379,${NODE2_IP}:2379,${NODE3_IP}:2379
+      - ETCD3_HOSTS=${NODE1_IP}:2379,${NODE2_IP}:2379,${NODE3_IP}:2379
       - PATRONI_SUPERUSER_USERNAME=postgres
       - PATRONI_SUPERUSER_PASSWORD=${POSTGRES_SUPERUSER_PASSWORD}
       - PATRONI_REPLICATION_USERNAME=replicator
       - PATRONI_REPLICATION_PASSWORD=${POSTGRES_REPLICATION_PASSWORD}
-      - PATRONI_SCOPE=authentik-cluster
-      - PATRONI_POSTGRESQL_DATA_DIR=/data/patroni
     ports:
       - "5432:5432"
       - "8008:8008"
     volumes:
-      - /data/compose/postgrecluster/pg_data:/data/patroni
+      - /data/compose/postgrecluster/pg_data:/home/postgres/pgdata
     depends_on:
       - etcd
\ No newline at end of file