diff --git a/dynamic/services.yaml b/dynamic/services.yaml
index 628e61e..c54d4f5 100644
--- a/dynamic/services.yaml
+++ b/dynamic/services.yaml
@@ -3,6 +3,7 @@ http:
     basic-auth:
       basicAuth:
         usersFile: /auth/htpasswd
+
     redirect-to-https:
       redirectScheme:
         scheme: https
@@ -30,7 +31,109 @@ http:
         accessControlMaxAge: 1728000
 
   routers:
+    # ----------------------
+    # HTTP routers for redirect
+    # ----------------------
     # Dashboard
+    traefik-dashboard-http:
+      rule: "Host(`traefik.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    plex-http:
+      rule: "Host(`plex.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    sonarr-http:
+      rule: "Host(`sonarr.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    radarr-http:
+      rule: "Host(`radarr.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    jellyseerr-http:
+      rule: "Host(`jellyseerr.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    ombi-http:
+      rule: "Host(`ombi.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    qbit-http:
+      rule: "Host(`qbit.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    gitea-http:
+      rule: "Host(`gitea.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    drone-http:
+      rule: "Host(`drone.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    dcr-http:
+      rule: "Host(`dcr.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    registry-http:
+      rule: "Host(`registry.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    portainer-http:
+      rule: "Host(`portainer.aetoskia.com`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect-to-https
+      service: noop@internal
+
+    # ----------------------
+    # HTTPS routers
+    # ----------------------
     traefik-dashboard:
       rule: "Host(`traefik.aetoskia.com`)"
       entryPoints:
@@ -39,10 +142,9 @@ http:
       tls:
         certResolver: aetoskia
       middlewares:
-        - redirect-to-https
         - basic-auth
 
-    # Media Services
+    # Media
     plex:
       rule: "Host(`plex.aetoskia.com`)"
       entryPoints:
@@ -50,8 +152,6 @@ http:
       service: plex-svc
       tls:
         certResolver: aetoskia
-      middlewares:
-        - redirect-to-https
 
     sonarr:
       rule: "Host(`sonarr.aetoskia.com`)"
@@ -60,8 +160,6 @@ http:
       service: sonarr-svc
       tls:
         certResolver: aetoskia
-      middlewares:
-        - redirect-to-https
 
     radarr:
       rule: "Host(`radarr.aetoskia.com`)"
@@ -70,8 +168,6 @@ http:
       service: radarr-svc
       tls:
         certResolver: aetoskia
-      middlewares:
-        - redirect-to-https
 
     jellyseerr:
       rule: "Host(`jellyseerr.aetoskia.com`)"
@@ -80,8 +176,6 @@ http:
       service: jellyseerr-svc
       tls:
         certResolver: aetoskia
-      middlewares:
-        - redirect-to-https
 
     ombi:
       rule: "Host(`ombi.aetoskia.com`)"
@@ -90,8 +184,6 @@ http:
       service: ombi-svc
       tls:
         certResolver: aetoskia
-      middlewares:
-        - redirect-to-https
 
     qbit:
       rule: "Host(`qbit.aetoskia.com`)"
@@ -102,9 +194,8 @@ http:
         certResolver: aetoskia
       middlewares:
         - websocket-headers
-        - redirect-to-https
 
-    # Codebase Services
+    # Codebase
     gitea:
       rule: "Host(`gitea.aetoskia.com`)"
       entryPoints:
@@ -113,7 +204,6 @@ http:
       tls:
         certResolver: aetoskia
       middlewares:
-        - redirect-to-https
         - websocket-headers
 
     drone:
@@ -124,7 +214,6 @@ http:
       tls:
         certResolver: aetoskia
       middlewares:
-        - redirect-to-https
         - websocket-headers
 
     dcr:
@@ -135,7 +224,6 @@ http:
       tls:
         certResolver: aetoskia
       middlewares:
-        - redirect-to-https
         - dcr-cors
 
     registry:
@@ -145,9 +233,6 @@ http:
       service: registry-svc
       tls:
         certResolver: aetoskia
-      middlewares:
-#        - basic-auth
-        - redirect-to-https
 
     # Monitoring
     portainer:
@@ -157,8 +242,6 @@ http:
       service: portainer-svc
       tls:
         certResolver: aetoskia
-      middlewares:
-        - redirect-to-https
 
   services:
     # Media