diff --git a/lib/autodiscover.sh b/lib/autodiscover.sh
index 1c852a2..c42a27e 100644
--- a/lib/autodiscover.sh
+++ b/lib/autodiscover.sh
@@ -37,14 +37,14 @@ services:
       - ./.env
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.autodiscover.rule=Host(\`autoconfig.$DOMAIN\`,\`autodiscover.$DOMAIN\`)"
+      - "traefik.http.routers.autodiscover.rule=Host(\`autoconfig.$DOMAIN\`) || Host(\`autodiscover.$DOMAIN\`)"
       - "traefik.http.routers.autodiscover.service=autodiscover"
       - "traefik.http.routers.autodiscover.entrypoints=websecure"
       - "traefik.http.routers.autodiscover.tls.certresolver=letsencrypt"
       - "traefik.http.services.autodiscover.loadbalancer.server.port=8000"
       - "traefik.http.routers.autodiscover.middlewares=autodiscover-auth"
       - "traefik.http.middlewares.autodiscover-auth.basicauth.users=$TRAEFIK_HTTPAUTH_STRING_AUTODISCOVER"
-      - "traefik.http.routers.autodiscovernew.rule=Host(\`autoconfig.$DOMAIN\`,\`autodiscover.$DOMAIN\`) && PathPrefix(\`/mail\`)"
+      - "traefik.http.routers.autodiscovernew.rule=(Host(\`autoconfig.$DOMAIN\`) || Host(\`autodiscover.$DOMAIN\`)) && PathPrefix(\`/mail\`)"
       - "traefik.http.routers.autodiscovernew.entrypoints=websecure"
       - "traefik.http.routers.autodiscovernew.tls.certresolver=letsencrypt"
       - "traefik.http.routers.autodiscovernew.service=autodiscovernew"
diff --git a/lib/bookstack.sh b/lib/bookstack.sh
index b559130..06c5751 100644
--- a/lib/bookstack.sh
+++ b/lib/bookstack.sh
@@ -31,7 +31,7 @@ services:
       - ./data/config:/config
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.bookstack.rule=Host(\`bookstack.$DOMAIN\`,\`documentation.$DOMAIN\`)"
+      - "traefik.http.routers.bookstack.rule=Host(\`bookstack.$DOMAIN\`) || Host(\`documentation.$DOMAIN\`)"
       - "traefik.http.routers.bookstack.entrypoints=websecure"
       - "traefik.http.routers.bookstack.tls.certresolver=letsencrypt"
 
diff --git a/lib/caddy.sh b/lib/caddy.sh
index 3830dae..d88545c 100644
--- a/lib/caddy.sh
+++ b/lib/caddy.sh
@@ -36,7 +36,7 @@ services:
       - ./data/data:/data
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.caddy.rule=Host(\`caddy.$DOMAIN\`,\`blog.$DOMAIN\`)"
+      - "traefik.http.routers.caddy.rule=Host(\`caddy.$DOMAIN\`) || Host(\`blog.$DOMAIN\`)"
       - "traefik.http.routers.caddy.entrypoints=websecure"
       - "traefik.http.routers.caddy.tls.certresolver=letsencrypt"
 
diff --git a/lib/castopod.sh b/lib/castopod.sh
index 921673f..fb7b10b 100644
--- a/lib/castopod.sh
+++ b/lib/castopod.sh
@@ -29,7 +29,7 @@ services:
       - ./.env
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.castopod.rule=Host(\`castopod.$DOMAIN\`,\`podcasts.$DOMAIN\`)"
+      - "traefik.http.routers.castopod.rule=Host(\`castopod.$DOMAIN\`) || Host(\`podcasts.$DOMAIN\`)"
       - "traefik.http.routers.castopod.entrypoints=websecure"
       - "traefik.http.routers.castopod.tls.certresolver=letsencrypt"
       - "traefik.http.services.castopod.loadbalancer.server.port=8000"
@@ -39,8 +39,8 @@ networks:
     external: true
 EOF
 
-CP_ANALYTICS_SALT=$(create_password);
-CASTOPOD_SECRET=$(create_password);
+CP_ANALYTICS_SALT=$(create_password)
+CASTOPOD_SECRET=$(create_password)
 
 [[ "${PLUS}" = "true" ]] && sed -i "s/letsencrypt/httpresolver/g" /federated/apps/castopod/docker-compose.yml
 
diff --git a/lib/discourse.sh b/lib/discourse.sh
index c534468..19c0560 100644
--- a/lib/discourse.sh
+++ b/lib/discourse.sh
@@ -41,7 +41,7 @@ services:
       - ./data/discourse/log:/opt/bitnami/discourse/log
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.discourse.rule=Host(\`discourse.$DOMAIN\`, \`forum.$DOMAIN\`)"
+      - "traefik.http.routers.discourse.rule=Host(\`discourse.$DOMAIN\`) || Host(\`forum.$DOMAIN\`)"
       - "traefik.http.routers.discourse.entrypoints=websecure"
       - "traefik.http.routers.discourse.tls.certresolver=letsencrypt"
     logging:
diff --git a/lib/roundcube.sh b/lib/roundcube.sh
index d02f619..26d8bfe 100644
--- a/lib/roundcube.sh
+++ b/lib/roundcube.sh
@@ -30,7 +30,7 @@ services:
       - ./data/var/www/html:/var/www/html
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.roundcube.rule=Host(\`roundcube.$DOMAIN\`,\`webmail.$DOMAIN\`)"
+      - "traefik.http.routers.roundcube.rule=Host(\`roundcube.$DOMAIN\`) || Host(\`webmail.$DOMAIN\`)"
       - "traefik.http.routers.roundcube.entrypoints=websecure"
       - "traefik.http.routers.roundcube.tls.certresolver=letsencrypt"
 
diff --git a/lib/wordpress.sh b/lib/wordpress.sh
index a7b9789..212d096 100644
--- a/lib/wordpress.sh
+++ b/lib/wordpress.sh
@@ -35,7 +35,7 @@ services:
       - ./data/bitnami/wordpress:/bitnami/wordpress
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.wordpress.rule=Host(\`www.$DOMAIN\`,\`$DOMAIN\`,\`wordpress.$DOMAIN\`)"
+      - "traefik.http.routers.wordpress.rule=Host(\`www.$DOMAIN\`) || Host(\`$DOMAIN\`) || Host(\`wordpress.$DOMAIN\`)"
       - "traefik.http.routers.wordpress.entrypoints=websecure"
       - "traefik.http.routers.wordpress.tls.certresolver=letsencrypt"
       - "traefik.http.services.wordpress.loadbalancer.server.port=8080"