diff --git a/docs/docker-compose-traefik-v1.yml b/docs/docker-compose-traefik-v1.yml
index ed64bd3..a5ea12d 100644
--- a/docs/docker-compose-traefik-v1.yml
+++ b/docs/docker-compose-traefik-v1.yml
@@ -25,7 +25,7 @@ services:
       - ./letsencrypt:/letsencrypt
 
   traefik-certs-dumper:
-    image: ldez/traefik-certs-dumper:v2.7.0
+    image: ldez/traefik-certs-dumper:v2.7.4
     entrypoint: sh -c '
       apk add jq
       ; while ! [ -e /data/acme.json ]
@@ -38,7 +38,7 @@ services:
       - ./letsencrypt:/data
 
   whoami:
-    image: containous/whoami
+    image: traefik/whoami:v1.6.0
     labels:
       traefik.enable: true
       traefik.frontend.rule: Host:example.com
diff --git a/docs/docker-compose-traefik-v2.yml b/docs/docker-compose-traefik-v2.yml
new file mode 100644
index 0000000..969f8dd
--- /dev/null
+++ b/docs/docker-compose-traefik-v2.yml
@@ -0,0 +1,46 @@
+version: '3.7'
+
+services:
+
+  traefik:
+    image: traefik:v2.3
+    command:
+      - --log.level=INFO
+      - --entrypoints.web.address=:80
+      - --entrypoints.web.http.redirections.entrypoint.to=websecure
+      - --entrypoints.web.http.redirections.entrypoint.scheme=https
+      - --entrypoints.websecure.address=:443
+      - --entrypoints.websecure.http.tls=true
+      - --entrypoints.websecure.http.tls.certResolver=le
+      - --providers.docker.exposedbydefault=false
+      - --certificatesresolvers.le.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory
+      - --certificatesresolvers.le.acme.email=email@example.com
+      - --certificatesresolvers.le.acme.storage=/letsencrypt/acme.json
+      - --certificatesresolvers.le.acme.tlsChallenge=true
+    ports:
+      - 80:80
+      - 443:443
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ./letsencrypt/:/letsencrypt
+
+  traefik-certs-dumper:
+    image: ldez/traefik-certs-dumper:v2.7.4
+    entrypoint: sh -c '
+      apk add jq
+      ; while ! [ -e /data/acme.json ]
+      || ! [ `jq ".[] | .Certificates | length" /data/acme.json` != 0 ]; do
+      sleep 1
+      ; done
+      && traefik-certs-dumper file --version v2 --watch
+      --source /data/acme.json --dest /data/certs'
+    volumes:
+      - ./letsencrypt:/data
+
+  whoami:
+    image: traefik/whoami:v1.6.0
+    labels:
+      traefik.enable: 'true'
+
+      traefik.http.routers.app.rule: Host(`example.com`)
+      traefik.http.routers.app.entrypoints: websecure
diff --git a/readme.md b/readme.md
index c01a44f..4da8aeb 100644
--- a/readme.md
+++ b/readme.md
@@ -27,7 +27,7 @@ If you appreciate this project:
 ### Download / CI Integration
 
 ```bash
-curl -sfL https://raw.githubusercontent.com/ldez/traefik-certs-dumper/master/godownloader.sh | bash -s -- -b $GOPATH/bin v2.7.0
+curl -sfL https://raw.githubusercontent.com/ldez/traefik-certs-dumper/master/godownloader.sh | bash -s -- -b $(go env GOPATH)/bin v2.7.4
 ```
 
 <!--
@@ -56,7 +56,10 @@ You can use pre-compiled binaries:
 docker run ldez/traefik-certs-dumper:<tag_name>
 ```
 
-Example: [docker-compose](docs/docker-compose-traefik-v1.yml)
+Examples:
+
+- Traefik v1: [docker-compose](docs/docker-compose-traefik-v1.yml)
+- Traefik v2: [docker-compose](docs/docker-compose-traefik-v2.yml)
 
 ## Usage