diff --git a/compose/lite/docker-compose.yml b/compose/lite/docker-compose.yml
index e979803fa..47417d389 100644
--- a/compose/lite/docker-compose.yml
+++ b/compose/lite/docker-compose.yml
@@ -24,6 +24,8 @@ services:
     expose:
       - 9091
     restart: unless-stopped
+    healthcheck:
+      disable: true
     environment:
       - TZ=Australia/Melbourne
 
@@ -74,10 +76,9 @@ services:
       - '--certificatesResolvers.letsencrypt.acme.httpChallenge.entryPoint=http'
       - '--log=true'
       - '--log.level=DEBUG'
-      - '--log.filepath=/var/log/traefik.log'
 
   secure:
-    image: containous/whoami
+    image: traefik/whoami
     container_name: secure
     networks:
       - net
@@ -93,7 +94,7 @@ services:
     restart: unless-stopped
 
   public:
-    image: containous/whoami
+    image: traefik/whoami
     container_name: public
     networks:
       - net
diff --git a/compose/local/docker-compose.yml b/compose/local/docker-compose.yml
index 4996dd9fa..22f55d839 100644
--- a/compose/local/docker-compose.yml
+++ b/compose/local/docker-compose.yml
@@ -24,6 +24,8 @@ services:
     expose:
       - 9091
     restart: unless-stopped
+    healthcheck:
+      disable: true
     environment:
       - TZ=Australia/Melbourne
 
@@ -59,10 +61,9 @@ services:
       - '--entrypoints.https.address=:443'
       - '--log=true'
       - '--log.level=DEBUG'
-      - '--log.filepath=/var/log/traefik.log'
 
   secure:
-    image: containous/whoami
+    image: traefik/whoami
     container_name: secure
     networks:
       - net
@@ -78,7 +79,7 @@ services:
     restart: unless-stopped
 
   public:
-    image: containous/whoami
+    image: traefik/whoami
     container_name: public
     networks:
       - net
diff --git a/docs/deployment/deployment-lite.md b/docs/deployment/deployment-lite.md
index ddad602e8..05d54cb43 100644
--- a/docs/deployment/deployment-lite.md
+++ b/docs/deployment/deployment-lite.md
@@ -22,7 +22,7 @@ provision](https://docs.traefik.io/https/acme/) up-to-date certificates for your
 Traefik publishes the respective services with LetsEncrypt provided certificates on port `443`.
 The provided examples protect the Traefik dashboard with Authelia's one-factor auth
 (traefik.example.com) and two instances of the
-[whoami container](https://hub.docker.com/r/containous/whoami) with Authelia being
+[whoami container](https://hub.docker.com/r/traefik/whoami) with Authelia being
 bypassed (public.example.com) and another with it's two-factor auth (secure.example.com). 
 
 If you happen to already have an external SQL instance (MariaDB, MySQL or Postgres) this