diff --git a/traefik/compose.yaml b/traefik/compose.yaml
index eff00c3..492f401 100644
--- a/traefik/compose.yaml
+++ b/traefik/compose.yaml
@@ -19,11 +19,14 @@ services:
       - "--entryPoints.web.address=:80"
       - "--entryPoints.websecure.address=:443"
       - "--entryPoints.websecure.http.tls=true"
+      - "--entryPoints.web.http.redirections.entryPoint.to=websecure"
+      - "--entryPoints.web.http.redirections.entryPoint.scheme=https"
       - "--entryPoints.ssh.address=:2221"
 
       # Let's Encrypt
       - "--certificatesresolvers.letsencrypt.acme.email=${EMAIL}"
       - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
+      - "--certificatesresolvers.letsencrypt.acme.httpchallenge=true"
       - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web"
       # # STAGING
       # - "--certificatesresolvers.letsencrypt.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
diff --git a/traefik/dynamic/middlewares.yml b/traefik/dynamic/middlewares.yml
index 0dba63f..40eddfb 100644
--- a/traefik/dynamic/middlewares.yml
+++ b/traefik/dynamic/middlewares.yml
@@ -1,5 +1,10 @@
 http:
   middlewares:
+    # HTTPS Redirect
+    redirect-https:
+      redirectScheme:
+        scheme: https
+        permanent: true
     # Cloudflare IP Whitelist
     cloudflare-ipwhitelist:
       ipWhiteList:
diff --git a/traefik/dynamic/redirect.yml b/traefik/dynamic/redirect.yml
index fdcea94..334325f 100644
--- a/traefik/dynamic/redirect.yml
+++ b/traefik/dynamic/redirect.yml
@@ -1,10 +1,4 @@
 http:
-  middlewares:
-    redirect-https:
-      redirectScheme:
-        scheme: https
-        permanent: true
-
   routers:
     acme-challenge-exempt:
       rule: "PathPrefix(`/.well-known/acme-challenge`)"
@@ -12,12 +6,3 @@ http:
         - web
       service: noop@internal
       priority: 100
-
-    http-catchall:
-      rule: "HostRegexp(`{host:.+}`)"
-      entryPoints:
-        - web
-      middlewares:
-        - redirect-https
-      service: noop@internal
-      priority: 1