diff --git a/examples/swarm/docker-compose-pg.yml b/examples/swarm/docker-compose-pg.yml
index 2f27e23a8..d5b127247 100644
--- a/examples/swarm/docker-compose-pg.yml
+++ b/examples/swarm/docker-compose-pg.yml
@@ -8,7 +8,7 @@ secrets:
 
 services:
   sentinel:
-    image: sorintlab/stolon:master-pg10
+    image: sorintlab/stolon:master-pg12
     command: gosu stolon stolon-sentinel --cluster-name stolon-cluster --store-backend=etcdv3 --store-endpoints http://etcd-00:2379,http://etcd-01:2379,http://etcd-02:2379 --log-level debug
     networks:
       - etcd_etcd
@@ -22,7 +22,7 @@ services:
         failure_action: pause
 
   keeper1:
-    image: sorintlab/stolon:master-pg10
+    image: sorintlab/stolon:master-pg12
     hostname: keeper1
     environment:
       - PGDATA=/var/lib/postgresql/data
@@ -41,7 +41,7 @@ services:
 #        constraints: [node.labels.nodename == node1]
 
   keeper2:
-    image: sorintlab/stolon:master-pg10
+    image: sorintlab/stolon:master-pg12
     hostname: keeper2
     environment:
       - PGDATA=/var/lib/postgresql/data
@@ -49,7 +49,7 @@ services:
       - pgkeeper2:/var/lib/postgresql/data
     secrets:
       - pgsql
-    command: gosu stolon stolon-keeper --pg-listen-address keeper2 --pg-repl-username replication --uid keeper2 --pg-su-username postgres --pg-su-passwordfile /run/secrets/pgsql --pg-repl-passwordfile /run/secrets/pgsql --data-dir /var/lib/postgresql/data --cluster-name stolon-cluster --store-backend=etcdv3 --store-endpoints http://etcd-00:2379,http://etcd-01:2379,http://etcd-02:2379 --log-level debug
+    command: gosu stolon stolon-keeper --pg-listen-address keeper2 --pg-repl-username replication --uid keeper2 --pg-su-username postgres --pg-su-passwordfile /run/secrets/pgsql --pg-repl-passwordfile /run/secrets/pgsql_repl --data-dir /var/lib/postgresql/data --cluster-name stolon-cluster --store-backend=etcdv3 --store-endpoints http://etcd-00:2379,http://etcd-01:2379,http://etcd-02:2379 --log-level debug
     networks:
       - etcd_etcd
       - pgdb
@@ -59,7 +59,7 @@ services:
 #        constraints: [node.labels.nodename == node2]
 
   proxy:
-    image: sorintlab/stolon:master-pg10
+    image: sorintlab/stolon:master-pg12
     command: gosu stolon stolon-proxy --listen-address 0.0.0.0 --cluster-name stolon-cluster --store-backend=etcdv3 --store-endpoints http://etcd-00:2379,http://etcd-01:2379,http://etcd-02:2379 --log-level info
     networks:
       - etcd_etcd