diff --git a/templates/compose/redisinsight.yml.j2 b/templates/compose/redisinsight.yml.j2
index 489c3a4..fa3a903 100644
--- a/templates/compose/redisinsight.yml.j2
+++ b/templates/compose/redisinsight.yml.j2
@@ -19,7 +19,7 @@ services:
     labels:
       traefik.enable: "true"
       ## IP
-      traefik.http.routers.redisinsight.rule: "Host(`{{ redisinsight_domain }}`){% if redisinsight_whitelist is defined %} && ClientIP({% for ip in redisinsight_whitelist %}`{{ ip }}`,{% endfor %}){% endif %}"
+      traefik.http.routers.redisinsight.rule: "Host(`{{ redisinsight_domain }}`){% if redisinsight_whitelist is defined %} && ({% for ip in redisinsight_whitelist %}{% if not loop.last %}ClientIP(`{{ ip }}`) || {% else %}ClientIP(`{{ ip }}`){% endif %}{% endfor %}){% endif %}"
       traefik.http.routers.redisinsight.entrypoints: "websecure"
       traefik.http.routers.redisinsight.tls.certresolver: "letsencrypt"
       traefik.http.services.redisinsight.loadbalancer.server.port: "5000"
diff --git a/templates/compose/wikijs.yml.j2 b/templates/compose/wikijs.yml.j2
index 1440599..671f94a 100644
--- a/templates/compose/wikijs.yml.j2
+++ b/templates/compose/wikijs.yml.j2
@@ -57,8 +57,7 @@ services:
     labels:
       traefik.enable: true
       traefik.docker.network: traefik
-      #traefik.http.routers.wikijs.rule: "Host(`{{ wikijs_domain }}`){% if wikijs_whitelist is defined %} && ClientIP({% for ip in wikijs_whitelist %}`{{ ip }}`,{% endfor %}){% endif %}"
-      traefik.http.routers.wikijs.rule: "Host(`{{ wikijs_domain }}`){% if wikijs_whitelist is defined %} && ({% for ip in wikijs_whitelist %}{% if not loop.last %}ClientIP(`{{ ip }}`) ||{%else}ClientIP(`{{ ip }}`){% endif %}{% endfor %}){% endif %}"
+      traefik.http.routers.wikijs.rule: "Host(`{{ wikijs_domain }}`){% if wikijs_whitelist is defined %} && ({% for ip in wikijs_whitelist %}{% if not loop.last %}ClientIP(`{{ ip }}`) || {% else %}ClientIP(`{{ ip }}`){% endif %}{% endfor %}){% endif %}"
       traefik.http.routers.wikijs.tls: true
       traefik.http.routers.wikijs.tls.certresolver: letsencrypt
       traefik.http.routers.wikijs.entrypoints: "websecure"