diff --git a/examples/swarm/.env b/examples/swarm/.env
new file mode 100644
index 000000000..1737ca00b
--- /dev/null
+++ b/examples/swarm/.env
@@ -0,0 +1 @@
+ETCD_TOKEN=hapg-etcd
diff --git a/examples/swarm/docker-compose-etcd.yml b/examples/swarm/docker-compose-etcd.yml
index 3eec42123..b8947182e 100644
--- a/examples/swarm/docker-compose-etcd.yml
+++ b/examples/swarm/docker-compose-etcd.yml
@@ -15,6 +15,9 @@ services:
       - --initial-cluster=etcd-00=http://etcd-00:2380,etcd-01=http://etcd-01:2380,etcd-02=http://etcd-02:2380
       - --initial-cluster-state=new
       - --initial-cluster-token=${ETCD_TOKEN}
+      - --auto-compaction-mode=revision   # If You are using etcd only for stolon then You need no revision history at all
+      - --auto-compaction-retention=100   # on etcd (https://github.com/sorintlab/stolon/blob/master/doc/architecture.md#etcdv3-compaction)
+      - --log-level=warn
     volumes:
       - etcd-00vol:/data.etcd
     networks:
@@ -38,6 +41,9 @@ services:
       - --initial-cluster=etcd-00=http://etcd-00:2380,etcd-01=http://etcd-01:2380,etcd-02=http://etcd-02:2380
       - --initial-cluster-state=new
       - --initial-cluster-token=${ETCD_TOKEN}
+      - --auto-compaction-mode=revision
+      - --auto-compaction-retention=100
+      - --log-level=warn
     volumes:
       - etcd-01vol:/data.etcd
     networks:
@@ -59,6 +65,9 @@ services:
       - --initial-cluster=etcd-00=http://etcd-00:2380,etcd-01=http://etcd-01:2380,etcd-02=http://etcd-02:2380
       - --initial-cluster-state=new
       - --initial-cluster-token=${ETCD_TOKEN}
+      - --auto-compaction-mode=revision
+      - --auto-compaction-retention=100
+      - --log-level=warn
     volumes:
       - etcd-02vol:/data.etcd
     networks:
diff --git a/examples/swarm/docker-compose-pg.yml b/examples/swarm/docker-compose-pg.yml
index 2f27e23a8..d25620374 100644
--- a/examples/swarm/docker-compose-pg.yml
+++ b/examples/swarm/docker-compose-pg.yml
@@ -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