diff --git a/ansible/roles/pve_docker/files/whoami/docker-compose.yml b/ansible/roles/pve_docker/files/whoami/docker-compose.yml
index 0c1cd24..65aeeb3 100644
--- a/ansible/roles/pve_docker/files/whoami/docker-compose.yml
+++ b/ansible/roles/pve_docker/files/whoami/docker-compose.yml
@@ -6,7 +6,10 @@ services:
     restart: unless-stopped
     labels:
       - traefik.enable=true
-      - traefik.http.routers.whoami.rule=Host(`whoami.theorangeone.net`) || Host(`who.0rng.one`)
+      - traefik.http.routers.whoami.rule=Host(`whoami.theorangeone.net`)
+
+      - traefik.http.routers.0rng-whoami.rule=Host(`who.0rng.one`)
+      - traefik.http.routers.0rng-whoami.tls.certresolver=gandi
     networks:
       - default
       - traefik
diff --git a/ansible/roles/upload/files/docker-compose.yml b/ansible/roles/upload/files/docker-compose.yml
index a952958..1953d51 100644
--- a/ansible/roles/upload/files/docker-compose.yml
+++ b/ansible/roles/upload/files/docker-compose.yml
@@ -25,7 +25,10 @@ services:
       - PUID={{ docker_user.id }}
     labels:
       - traefik.enable=true
-      - traefik.http.routers.img.rule=Host(`img.theorangeone.net`) || Host(`img.0rng.one`)
+      - traefik.http.routers.img.rule=Host(`img.theorangeone.net`)
+
+      - traefik.http.routers.0rng-img.tls.certresolver=gandi
+      - traefik.http.routers.0rng-img.rule=Host(`img.0rng.one`)
     networks:
       - default
       - traefik
diff --git a/ansible/roles/yourls/files/docker-compose.yml b/ansible/roles/yourls/files/docker-compose.yml
index d7aee6b..13f14e7 100644
--- a/ansible/roles/yourls/files/docker-compose.yml
+++ b/ansible/roles/yourls/files/docker-compose.yml
@@ -18,6 +18,7 @@ services:
     labels:
       - traefik.enable=true
       - traefik.http.routers.yourls.rule=Host(`0rng.one`)
+      - traefik.http.routers.yourls.tls.certresolver=gandi
     networks:
       - default
       - traefik