diff --git a/adguardhome/compose.yaml b/adguardhome/compose.yaml
index 518847e..290f600 100644
--- a/adguardhome/compose.yaml
+++ b/adguardhome/compose.yaml
@@ -21,7 +21,7 @@ services:
       # Prod Router
       - "traefik.http.routers.adguard.rule=Host(`dns.forust.xyz`) || Host(`adguard.forust.xyz`)"
       - "traefik.http.routers.adguard.entrypoints=websecure"
-      - "traefik.http.routers.adguard.tls=true"
+      - "traefik.http.routers.adguard.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.adguard-local.rule=Host(`adguard.workstation.internal`) || Host(`dns.workstation.internal`)"
       - "traefik.http.routers.adguard-local.entrypoints=websecure"
@@ -31,9 +31,9 @@ services:
       - "traefik.http.routers.adguard-dev.entrypoints=websecure"
       - "traefik.http.routers.adguard-dev.tls=true"
       # DoH Router
-      - "traefik.http.routers.dns.rule=(Host(`dns.forust.xyz`) && PathPrefix(`/dns-query`))"
-      - "traefik.http.routers.dns.entrypoints=websecure"
-      - "traefik.http.routers.dns.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.dns-over-https.rule=(Host(`dns.forust.xyz` || Host(`adguard.forust.xyz`)) && PathPrefix(`/dns-query`))"
+      - "traefik.http.routers.dns-over-https.entrypoints=websecure"
+      - "traefik.http.routers.dns-over-https.tls.certresolver=letsencrypt"
       
       # Glance Metadata
       - glance.name=adguard
diff --git a/adguardhome/k8s/ingress.yaml b/adguardhome/k8s/ingress.yaml
index 43af84f..c773608 100644
--- a/adguardhome/k8s/ingress.yaml
+++ b/adguardhome/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^(adguard|dns)\.forust\.xyz$`)
+    - match: Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`)
       kind: Rule
       services:
         - name: adguard-service
@@ -39,7 +39,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^(adguard|dns)\.forust\.xyz$`) && PathPrefix(`/dns-query`)
+    - match: (Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`)) && PathPrefix(`/dns-query`)
       kind: Rule
       services:
         - name: adguard-service
diff --git a/authentik/compose.yaml b/authentik/compose.yaml
index 88ccc7a..e2c81da 100644
--- a/authentik/compose.yaml
+++ b/authentik/compose.yaml
@@ -47,7 +47,7 @@ services:
       # Prod Router
       - "traefik.http.routers.authentik-server.rule=Host(`auth.forust.xyz`)"
       - "traefik.http.routers.authentik-server.entrypoints=websecure"
-      - "traefik.http.routers.authentik-server.tls=true"
+      - "traefik.http.routers.authentik-server.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.authentik-server-local.rule=Host(`auth.workstation.internal`)"
       - "traefik.http.routers.authentik-server-local.entrypoints=websecure"
diff --git a/authentik/k8s/ingress.yaml b/authentik/k8s/ingress.yaml
index 5f08206..6297b9f 100644
--- a/authentik/k8s/ingress.yaml
+++ b/authentik/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^auth\.forust\.xyz$`)
+    - match: Host(`auth.forust.xyz`)
       kind: Rule
       services:
         - name: authentik-server-service
@@ -29,4 +29,3 @@ spec:
       services:
         - name: authentik-server-service
           port: 9000
-
diff --git a/checkmk/compose.yaml b/checkmk/compose.yaml
index 4fd68e9..9febca1 100644
--- a/checkmk/compose.yaml
+++ b/checkmk/compose.yaml
@@ -21,7 +21,7 @@ services:
       # Prod Router
       - "traefik.http.routers.checkmk.rule=Host(`cmk.forust.xyz`)"
       - "traefik.http.routers.checkmk.entrypoints=websecure"
-      - "traefik.http.routers.checkmk.tls=true"
+      - "traefik.http.routers.checkmk.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.checkmk-local.rule=Host(`cmk.workstation.internal`)"
       - "traefik.http.routers.checkmk-local.entrypoints=websecure"
diff --git a/checkmk/k8s/ingress.yaml b/checkmk/k8s/ingress.yaml
index 73efe64..a4ec055 100644
--- a/checkmk/k8s/ingress.yaml
+++ b/checkmk/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^cmk\.forust\.xyz$`)
+    - match: Host(`cmk.forust.xyz`)
       kind: Rule
       services:
         - name: checkmk-service
@@ -29,4 +29,3 @@ spec:
       services:
         - name: checkmk-service
           port: 5000
-
diff --git a/convertx/compose.yaml b/convertx/compose.yaml
index b6bf9d5..ce24040 100644
--- a/convertx/compose.yaml
+++ b/convertx/compose.yaml
@@ -21,16 +21,19 @@ services:
       - "traefik.enable=true"
       - "traefik.http.services.convertx.loadbalancer.server.port=3000"
       # Prod Router
-      - "traefik.http.routers.convertx.rule=Host(`convert.forust.xyz`)"
+      - "traefik.http.routers.convertx.rule=(Host(`forust.xyz`) || Host(`www.forust.xyz`)) && PathPrefix(`/convert`)"
       - "traefik.http.routers.convertx.entrypoints=websecure"
-      - "traefik.http.routers.convertx.tls=true"
+      - "traefik.http.routers.convertx.priority=50"
+      - "traefik.http.routers.convertx.tls.certresolver=letsencrypt"
       # Local Router
-      - "traefik.http.routers.convertx-local.rule=Host(`convert.workstation.internal`)"
+      - "traefik.http.routers.convertx-local.rule=Host(`workstation.internal`) && PathPrefix(`/convert`)"
       - "traefik.http.routers.convertx-local.entrypoints=websecure"
+      - "traefik.http.routers.convertx-local.priority=50"
       - "traefik.http.routers.convertx-local.tls=true"
       # Dev Router
-      - "traefik.http.routers.convertx-dev.rule=Host(`convertx.gigaforust.internal`)"
+      - "traefik.http.routers.convertx-dev.rule=Host(`gigaforust.internal`) && PathPrefix(`/convert`)"
       - "traefik.http.routers.convertx-dev.entrypoints=websecure"
+      - "traefik.http.routers.convertx-dev.priority=50"
       - "traefik.http.routers.convertx-dev.tls=true"
     networks:
       - proxy
diff --git a/convertx/k8s/ingress.yaml b/convertx/k8s/ingress.yaml
index a1890d5..353faa0 100644
--- a/convertx/k8s/ingress.yaml
+++ b/convertx/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^forust\.xyz$`) && PathPrefix(`/convert`)
+    - match: (Host(`forust.xyz`) || Host(`www.forust.xyz`)) && PathPrefix(`/convert`)
       kind: Rule
       priority: 50
       services:
diff --git a/dockmon/compose.yaml b/dockmon/compose.yaml
index 22d4f1b..5587566 100644
--- a/dockmon/compose.yaml
+++ b/dockmon/compose.yaml
@@ -23,7 +23,7 @@ services:
          - "traefik.http.routers.dockmon.rule=Host(`dockmon.forust.xyz`)"
          - "traefik.http.routers.dockmon.entrypoints=websecure"
          - "traefik.http.routers.dockmon.middlewares=security-headers@file"
-         - "traefik.http.routers.dockmon.tls=true"
+         - "traefik.http.routers.dockmon.tls.certresolver=letsencrypt"
          # Local Router
          - "traefik.http.routers.dockmon-local.rule=Host(`dockmon.workstation.internal`)"
          - "traefik.http.routers.dockmon-local.entrypoints=websecure"
diff --git a/dockmon/k8s/ingress.yaml b/dockmon/k8s/ingress.yaml
index 2963b80..417a652 100644
--- a/dockmon/k8s/ingress.yaml
+++ b/dockmon/k8s/ingress.yaml
@@ -15,7 +15,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^dockmon\.forust\.xyz$`)
+    - match: Host(`dockmon.forust.xyz`)
       kind: Rule
       middlewares:
         - name: security-headers@file
@@ -41,4 +41,3 @@ spec:
         - name: dockmon-service
           port: 443
           serversTransport: dockmon-transport
-
diff --git a/downtify/compose.yaml b/downtify/compose.yaml
index 8b2190d..3394421 100644
--- a/downtify/compose.yaml
+++ b/downtify/compose.yaml
@@ -15,7 +15,7 @@ services:
       - "traefik.http.routers.downtify.rule=Host(`downtify.forust.xyz`)"
       - "traefik.http.routers.downtify.entrypoints=websecure"
       - "traefik.http.routers.downtify.middlewares=security-chain@file"
-      - "traefik.http.routers.downtify.tls=true"
+      - "traefik.http.routers.downtify.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.downtify-local.rule=Host(`downtify.workstation.internal`)"
       - "traefik.http.routers.downtify-local.entrypoints=websecure"
diff --git a/downtify/k8s/ingress.yaml b/downtify/k8s/ingress.yaml
index 4bfb4ec..7c6f3ef 100644
--- a/downtify/k8s/ingress.yaml
+++ b/downtify/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^downtify\.forust\.xyz$`)
+    - match: Host(`downtify.forust.xyz`)
       kind: Rule
       middlewares:
         - name: security-chain@file
@@ -31,4 +31,3 @@ spec:
       services:
         - name: downtify-service
           port: 8000
-
diff --git a/gitea/compose.yaml b/gitea/compose.yaml
index 54bf84c..2cb53cd 100644
--- a/gitea/compose.yaml
+++ b/gitea/compose.yaml
@@ -36,7 +36,7 @@ services:
       # Prod Router
       - "traefik.http.routers.gitea.rule=Host(`gitea.forust.xyz`)"
       - "traefik.http.routers.gitea.entrypoints=websecure"
-      - "traefik.http.routers.gitea.tls=true"
+      - "traefik.http.routers.gitea.tls.certresolver"
       # Local Router
       - "traefik.http.routers.gitea-local.rule=Host(`gitea.workstation.internal`)"
       - "traefik.http.routers.gitea-local.entrypoints=websecure"
@@ -53,7 +53,6 @@ services:
       - "traefik.http.routers.gitea-registry.rule=Host(`gcr.forust.xyz`) && PathPrefix(`/v2`)"
       - "traefik.http.routers.gitea-registry.entrypoints=websecure"
       - "traefik.http.routers.gitea-registry.tls.certresolver=letsencrypt"
-      - "traefik.http.routers.gitea-registry.tls=true"
     ports:
       - "2221:22"
     networks:
diff --git a/gitea/k8s/ingress.yaml b/gitea/k8s/ingress.yaml
index 2db2dd0..5f66e18 100644
--- a/gitea/k8s/ingress.yaml
+++ b/gitea/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^gitea\.forust\.xyz$`)
+    - match: Host(`gitea.forust.xyz`)
       kind: Rule
       middlewares:
         - name: "crowdsec-crowdsec-bouncer@kubernetescrd"
diff --git a/glance/compose.yaml b/glance/compose.yaml
index ebf09b5..2027087 100644
--- a/glance/compose.yaml
+++ b/glance/compose.yaml
@@ -15,16 +15,19 @@ services:
       - "traefik.services.glance.loadbalancer.server.port=8080"
 
       # Prod Router
-      - "traefik.http.routers.glance.rule=Host(`glance.forust.xyz`)"
+      - "traefik.http.routers.glance.rule=(Host(`forust.xyz`) || Host(`www.forust.xyz`)) && PathPrefix(`/glance`)"
       - "traefik.http.routers.glance.entrypoints=websecure"
-      - "traefik.http.routers.glance.tls=true"
+      - "traefik.http.routers.glance.priority=50"
+      - "traefik.http.routers.glance.tls.certresolver=letsencrypt"
       # Local Router
-      - "traefik.http.routers.glance-local.rule=Host(`glance.workstation.internal`)"
+      - "traefik.http.routers.glance-local.rule=Host(`workstation.internal`) && PathPrefix(`/glance`)"
       - "traefik.http.routers.glance-local.entrypoints=websecure"
+      - "traefik.http.routers.glance-local.priority=50"
       - "traefik.http.routers.glance-local.tls=true"
       # Dev Router
-      - "traefik.http.routers.glance-dev.rule=Host(`glance.gigaforust.internal`)"
+      - "traefik.http.routers.glance-dev.rule=Host(`gigaforust.internal`) && PathPrefix(`/glance`)"
       - "traefik.http.routers.glance-dev.entrypoints=websecure"
+      - "traefik.http.routers.glance-dev.priority=50"
       - "traefik.http.routers.glance-dev.tls=true"
     networks:
       - proxy
diff --git a/glance/k8s/ingress.yaml b/glance/k8s/ingress.yaml
index 0c36d19..6ce0bf1 100644
--- a/glance/k8s/ingress.yaml
+++ b/glance/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^forust\.xyz$`) && PathPrefix(`/glance`)
+    - match: (Host(`forust.xyz`) || Host(`www.forust.xyz`)) && PathPrefix(`/glance`)
       kind: Rule
       priority: 50
       middlewares:
diff --git a/headscale/compose.yaml b/headscale/compose.yaml
index 338ae74..dde6b37 100644
--- a/headscale/compose.yaml
+++ b/headscale/compose.yaml
@@ -24,7 +24,7 @@ services:
       - "traefik.http.routers.headscale.rule=Host(`hs.forust.xyz`)"
       - "traefik.http.routers.headscale.entrypoints=websecure"
       - "traefik.http.routers.headscale.service=headscale"
-      - "traefik.http.routers.headscale.tls=true"
+      - "traefik.http.routers.headscale.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.headscale-local.rule=Host(`hs.workstation.internal`)"
       - "traefik.http.routers.headscale-local.entrypoints=websecure"
@@ -78,7 +78,7 @@ services:
       - "traefik.http.routers.headscale-ui.rule=Host(`hs.forust.xyz`) && PathPrefix(`/admin`)"
       - "traefik.http.routers.headscale-ui.entrypoints=websecure"
       - "traefik.http.routers.headscale-ui.middlewares=security-chain@file"
-      - "traefik.http.routers.headscale-ui.tls=true"
+      - "traefik.http.routers.headscale-ui.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.headscale-ui-local.rule=Host(`hs.workstation.internal`) && PathPrefix(`/admin`)"
       - "traefik.http.routers.headscale-ui-local.entrypoints=websecure"
diff --git a/headscale/k8s/ingress.yaml b/headscale/k8s/ingress.yaml
index 5c57319..4c5eddb 100644
--- a/headscale/k8s/ingress.yaml
+++ b/headscale/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^hs\.forust\.xyz$`)
+    - match: Host(`hs.forust.xyz`)
       kind: Rule
       services:
         - name: headscale-server-external
@@ -40,7 +40,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^hs\.forust\.xyz$`) && PathPrefix(`/admin`)
+    - match: Host(`hs.forust.xyz`) && PathPrefix(`/admin`)
       kind: Rule
       middlewares:
         - name: security-chain@file
@@ -75,13 +75,15 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^hs\.forust\.xyz$`) && PathPrefix(`/metrics`)
+    - match: Host(`hs.forust.xyz`) && PathPrefix(`/metrics`)
       kind: Rule
       services:
         - name: headscale-server-external
           port: 9090
   tls:
     certResolver: letsencrypt
+    domains:
+      - main: hs.forust.xyz
 ---
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
@@ -97,5 +99,3 @@ spec:
       services:
         - name: headscale-server-external
           port: 9090
-
-
diff --git a/homepages/compose.yaml b/homepages/compose.yaml
index 13d6528..f10a420 100644
--- a/homepages/compose.yaml
+++ b/homepages/compose.yaml
@@ -19,7 +19,7 @@ services:
       # Prod Router
       - "traefik.http.routers.forust-homepage.rule=Host(`forust.xyz`) || Host(`www.forust.xyz`)"
       - "traefik.http.routers.forust-homepage.entrypoints=websecure"
-      - "traefik.http.routers.forust-homepage.tls=true"
+      - "traefik.http.routers.forust-homepage.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.forust-homepage-local.rule=Host(`landing.workstation.internal`)"
       - "traefik.http.routers.forust-homepage-local.entrypoints=websecure"
@@ -47,7 +47,6 @@ services:
       - "traefik.http.routers.xdfnx.rule=Host(`xdfnx.cfd`) || Host(`www.xdfnx.cfd`)"
       - "traefik.http.routers.xdfnx.entrypoints=websecure"
       - "traefik.http.routers.xdfnx.tls.certresolver=letsencrypt"
-      - "traefik.http.routers.xdfnx.tls=true"
       # Local Router
       - "traefik.http.routers.xdfnx-local.rule=Host(`xdfnx.workstation.internal`)"
       - "traefik.http.routers.xdfnx-local.entrypoints=websecure"
diff --git a/homepages/k8s/ingress.yaml b/homepages/k8s/ingress.yaml
index d96ee57..39999bb 100644
--- a/homepages/k8s/ingress.yaml
+++ b/homepages/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^(forust\.xyz|www\.forust\.xyz)$`)
+    - match: Host(`forust.xyz`) || Host(`www.forust.xyz`)
       kind: Rule
       services:
         - name: forust-homepage-service
@@ -39,7 +39,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^(xdfnx\.cfd|www\.xdfnx\.cfd)$`)
+    - match: Host(`xdfnx.cfd`) || Host(`www.xdfnx.cfd`)
       kind: Rule
       services:
         - name: xdfnx-homepage-service
@@ -61,4 +61,3 @@ spec:
       services:
         - name: xdfnx-homepage-service
           port: 80
-
diff --git a/kener/compose.yaml b/kener/compose.yaml
index 05894b8..3a07fcf 100644
--- a/kener/compose.yaml
+++ b/kener/compose.yaml
@@ -23,7 +23,7 @@ services:
       # Prod Router
       - "traefik.http.routers.kener.rule=Host(`status.forust.xyz`)"
       - "traefik.http.routers.kener.entrypoints=websecure"
-      - "traefik.http.routers.kener.tls=true"
+      - "traefik.http.routers.kener.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.kener-local.rule=Host(`status.workstation.internal`)"
       - "traefik.http.routers.kener-local.entrypoints=websecure"
diff --git a/kener/k8s/ingress.yaml b/kener/k8s/ingress.yaml
index 01cb024..0b14999 100644
--- a/kener/k8s/ingress.yaml
+++ b/kener/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^status\.forust\.xyz$`)
+    - match: Host(`status.forust.xyz`)
       kind: Rule
       services:
         - name: kener-service
@@ -29,4 +29,3 @@ spec:
       services:
         - name: kener-service
           port: 3000
-
diff --git a/metube/compose.yaml b/metube/compose.yaml
index 742b2cd..e288b14 100644
--- a/metube/compose.yaml
+++ b/metube/compose.yaml
@@ -20,7 +20,7 @@ services:
       - "traefik.http.routers.metube.rule=Host(`metube.forust.xyz`)"
       - "traefik.http.routers.metube.entrypoints=websecure"
       - "traefik.http.routers.metube.middlewares=security-chain@file"
-      - "traefik.http.routers.metube.tls=true"
+      - "traefik.http.routers.metube.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.metube-local.rule=Host(`metube.workstation.internal`)"
       - "traefik.http.routers.metube-local.entrypoints=websecure"
diff --git a/metube/k8s/ingress.yaml b/metube/k8s/ingress.yaml
index 3494320..e70d510 100644
--- a/metube/k8s/ingress.yaml
+++ b/metube/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^metube\.forust\.xyz$`)
+    - match: Host(`metube.forust.xyz`)
       kind: Rule
       middlewares:
         - name: security-headers@file
@@ -31,4 +31,3 @@ spec:
       services:
         - name: metube-service
           port: 8081
-
diff --git a/n8n/compose.yaml b/n8n/compose.yaml
index e10cd56..1ae69ee 100644
--- a/n8n/compose.yaml
+++ b/n8n/compose.yaml
@@ -32,7 +32,7 @@ services:
       # Prod Router
       - "traefik.http.routers.n8n.rule=Host(`n8n.forust.xyz`)"
       - "traefik.http.routers.n8n.entrypoints=websecure"
-      - "traefik.http.routers.n8n.tls=true"
+      - "traefik.http.routers.n8n.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.n8n-local.rule=Host(`n8n.workstation.internal`)"
       - "traefik.http.routers.n8n-local.entrypoints=websecure"
diff --git a/n8n/k8s/ingress.yaml b/n8n/k8s/ingress.yaml
index 7bb9ea2..f0248c6 100644
--- a/n8n/k8s/ingress.yaml
+++ b/n8n/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^n8n\.forust\.xyz$`)
+    - match: Host(`n8n.forust.xyz`)
       kind: Rule
       services:
         - name: n8n-service
@@ -29,4 +29,3 @@ spec:
       services:
         - name: n8n-service
           port: 5678
-
diff --git a/netronome/compose.yaml b/netronome/compose.yaml
index 1650c7b..2b6993f 100644
--- a/netronome/compose.yaml
+++ b/netronome/compose.yaml
@@ -16,7 +16,7 @@ services:
       # Prod Router
       - "traefik.http.routers.netronome.rule=Host(`nm.forust.xyz`)"
       - "traefik.http.routers.netronome.entrypoints=websecure"
-      - "traefik.http.routers.netronome.tls=true"
+      - "traefik.http.routers.netronome.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.netronome-local.rule=Host(`nm.workstation.internal`)"
       - "traefik.http.routers.netronome-local.entrypoints=websecure"
diff --git a/netronome/k8s/ingress.yaml b/netronome/k8s/ingress.yaml
index fa8cecc..823e167 100644
--- a/netronome/k8s/ingress.yaml
+++ b/netronome/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^nm\.forust\.xyz$`)
+    - match: Host(`nm.forust.xyz`)
       kind: Rule
       services:
         - name: netronome-service
@@ -29,4 +29,3 @@ spec:
       services:
         - name: netronome-service
           port: 7575
-
diff --git a/nextcloud/compose.yaml b/nextcloud/compose.yaml
index 78f2aa6..5469d70 100644
--- a/nextcloud/compose.yaml
+++ b/nextcloud/compose.yaml
@@ -25,7 +25,7 @@ services:
       # - "traefik.http.routers.nextcloud-aio.rule=Host(`naio.forust.xyz`)"
       # - "traefik.http.routers.nextcloud-aio.entrypoints=websecure"
       # - "traefik.http.routers.nextcloud-aio.middlewares=security-chain@file"
-      # - "traefik.http.routers.nextcloud-aio.tls=true"
+      # - "traefik.http.routers.nextcloud-aio.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.nextcloud-aio-local.rule=Host(`naio.workstation.internal`)"
       - "traefik.http.routers.nextcloud-aio-local.entrypoints=websecure"
diff --git a/nextcloud/k8s/ingress.yaml b/nextcloud/k8s/ingress.yaml
index 4b42588..14764b3 100644
--- a/nextcloud/k8s/ingress.yaml
+++ b/nextcloud/k8s/ingress.yaml
@@ -8,7 +8,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^nextcloud\.forust\.xyz$`)
+    - match: Host(`nextcloud.forust.xyz`)
       kind: Rule
       middlewares:
         - name: nextcloud-chain@file
@@ -46,7 +46,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^naio\.forust\.xyz$`)
+    - match: Host(`naio.forust.xyz`)
       kind: Rule
       services:
         - name: nextcloud-aio
@@ -72,4 +72,3 @@ spec:
           port: 8888
           scheme: https
           serversTransport: insecure-transport
-
diff --git a/penpot/compose.yaml b/penpot/compose.yaml
index 4f098e7..81ecf5d 100644
--- a/penpot/compose.yaml
+++ b/penpot/compose.yaml
@@ -107,7 +107,7 @@ services:
       # Prod Router
       - "traefik.http.routers.penpot.rule=Host(`penpot.forust.xyz`)"
       - "traefik.http.routers.penpot.entrypoints=websecure"
-      - "traefik.http.routers.penpot.tls=true"
+      - "traefik.http.routers.penpot.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.penpot-local.rule=Host(`penpot.workstation.internal`)"
       - "traefik.http.routers.penpot-local.entrypoints=websecure"
diff --git a/portainer/compose.yaml b/portainer/compose.yaml
index 00ff4c3..cf6c920 100644
--- a/portainer/compose.yaml
+++ b/portainer/compose.yaml
@@ -16,7 +16,7 @@ services:
       # Prod Router
       - "traefik.http.routers.portainer.rule=Host(`portainer.forust.xyz`)"
       - "traefik.http.routers.portainer.entrypoints=websecure"
-      - "traefik.http.routers.portainer.tls=true"
+      - "traefik.http.routers.portainer.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.portainer-local.rule=Host(`portainer.workstation.internal`)"
       - "traefik.http.routers.portainer-local.entrypoints=websecure"
diff --git a/portainer/k8s/ingress.yaml b/portainer/k8s/ingress.yaml
index 8b8dbcf..47bb2ca 100644
--- a/portainer/k8s/ingress.yaml
+++ b/portainer/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^portainer\.forust\.xyz$`)
+    - match: Host(`portainer.forust.xyz`)
       kind: Rule
       services:
         - name: portainer-service
@@ -29,4 +29,3 @@ spec:
       services:
         - name: portainer-service
           port: 9000
-
diff --git a/searxng/compose.yaml b/searxng/compose.yaml
index 766b798..eae66a7 100644
--- a/searxng/compose.yaml
+++ b/searxng/compose.yaml
@@ -12,9 +12,9 @@ services:
       - "traefik.enable=true"
       - "traefik.http.services.searxng.loadbalancer.server.port=8080"
       # Prod Router
-      - "traefik.http.routers.searxng.rule=Host(`s.forust.xyz` || `searxng.forust.xyz`)"
+      - "traefik.http.routers.searxng.rule=Host(`s.forust.xyz` || `search.forust.xyz`)"
       - "traefik.http.routers.searxng.entrypoints=websecure"
-      - "traefik.http.routers.searxng.tls=true"
+      - "traefik.http.routers.searxng.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.searxng-local.rule=Host(`s.workstation.internal` || `searxng.workstation.internal`)"
       - "traefik.http.routers.searxng-local.entrypoints=websecure"
diff --git a/searxng/k8s/ingress.yaml b/searxng/k8s/ingress.yaml
index 2a22448..0c42675 100644
--- a/searxng/k8s/ingress.yaml
+++ b/searxng/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^(s|search)\.forust\.xyz$`)
+    - match: Host(`s.forust.xyz`) || Host(`search.forust.xyz`)
       kind: Rule
       services:
         - name: searxng-service
diff --git a/termix/compose.yaml b/termix/compose.yaml
index e084f46..590a1c5 100644
--- a/termix/compose.yaml
+++ b/termix/compose.yaml
@@ -16,7 +16,7 @@ services:
       # Prod Router
       - "traefik.http.routers.termix.rule=Host(`termix.forust.xyz`)"
       - "traefik.http.routers.termix.entrypoints=websecure"
-      - "traefik.http.routers.termix.tls=true"
+      - "traefik.http.routers.termix.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.termix-local.rule=Host(`termix.workstation.internal`)"
       - "traefik.http.routers.termix-local.entrypoints=websecure"
diff --git a/termix/k8s/ingress.yaml b/termix/k8s/ingress.yaml
index 3d2dd96..355b5eb 100644
--- a/termix/k8s/ingress.yaml
+++ b/termix/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^termix\.forust\.xyz$`)
+    - match: Host(`termix.forust.xyz`)
       kind: Rule
       services:
         - name: termix-service
@@ -29,4 +29,3 @@ spec:
       services:
         - name: termix-service
           port: 8080
-
diff --git a/traefik/compose.yaml b/traefik/compose.yaml
index 51b18b0..e1a036d 100644
--- a/traefik/compose.yaml
+++ b/traefik/compose.yaml
@@ -49,7 +49,7 @@ services:
       - "traefik.http.routers.traefik-dashboard.entrypoints=websecure"
       - "traefik.http.routers.traefik-dashboard.middlewares=security-chain@file"
       - "traefik.http.routers.traefik-dashboard.service=api@internal"
-      - "traefik.http.routers.traefik-dashboard.tls=true"
+      - "traefik.http.routers.traefik-dashboard.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.traefik-dashboard-local.rule=Host(`traefik.workstation.internal`)"
       - "traefik.http.routers.traefik-dashboard-local.entrypoints=websecure"
diff --git a/traefik/dynamic/nextcloud-apache.yml b/traefik/dynamic/nextcloud-apache.yml
index 2242927..ffd51a2 100644
--- a/traefik/dynamic/nextcloud-apache.yml
+++ b/traefik/dynamic/nextcloud-apache.yml
@@ -8,7 +8,8 @@ http:
       service: nextcloud
       middlewares:
         - nextcloud-chain
-      tls: {}
+      tls:
+        certresolver: letsencrypt
 
     # Nextcloud dev
     nextcloud-local:
diff --git a/traefik/k8s/ingress.yaml b/traefik/k8s/ingress.yaml
index ff71160..b8e52f8 100644
--- a/traefik/k8s/ingress.yaml
+++ b/traefik/k8s/ingress.yaml
@@ -8,7 +8,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^traefik\.forust\.xyz$`)
+    - match: Host(`traefik.forust.xyz`)
       kind: Rule
       services:
         - name: api@internal
@@ -30,4 +30,3 @@ spec:
       services:
         - name: api@internal
           kind: TraefikService
-
diff --git a/uptime-kuma/compose.yaml b/uptime-kuma/compose.yaml
index 683156e..33ddff1 100644
--- a/uptime-kuma/compose.yaml
+++ b/uptime-kuma/compose.yaml
@@ -14,7 +14,7 @@ services:
       # Prod Router
       - "traefik.http.routers.uptime-kuma.rule=Host(`uptime.forust.xyz`)"
       - "traefik.http.routers.uptime-kuma.entrypoints=websecure"
-      - "traefik.http.routers.uptime-kuma.tls=true"
+      - "traefik.http.routers.uptime-kuma.tls.certresolver=letsencrypt"
       # Local Router
       - "traefik.http.routers.uptime-kuma-local.rule=Host(`uptime.workstation.internal`)"
       - "traefik.http.routers.uptime-kuma-local.entrypoints=websecure"
diff --git a/uptime-kuma/k8s/ingress.yaml b/uptime-kuma/k8s/ingress.yaml
index 0c633a8..a31b373 100644
--- a/uptime-kuma/k8s/ingress.yaml
+++ b/uptime-kuma/k8s/ingress.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: HostRegexp(`^uptime\.forust\.xyz$`)
+    - match: Host(`uptime.forust.xyz`)
       kind: Rule
       services:
         - name: uptime-kuma-service
@@ -29,4 +29,3 @@ spec:
       services:
         - name: uptime-kuma-service
           port: 3001
-