diff --git a/abra.sh b/abra.sh
index 34dd633..918a1e9 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,2 +1,3 @@
 export ENTRYPOINT_CONF_VERSION=v13
+export CONFIG_JSON_VERSION=v1
 export PG_BACKUP_VERSION=v1
diff --git a/compose.yml b/compose.yml
index 22aed19..bf02d5b 100644
--- a/compose.yml
+++ b/compose.yml
@@ -50,9 +50,12 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
-        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
-        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
-        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
+        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirectscheme,${STACK_NAME}-redirecthostname"
+        - "traefik.http.middlewares.${STACK_NAME}-redirectscheme.redirectscheme.scheme=https"
+        - "traefik.http.middlewares.${STACK_NAME}-redirectscheme.redirectscheme.permanent=true"
+        - "traefik.http.middlewares.${STACK_NAME}-redirecthostname.redirectregex.regex=^http[s]?://([^/]*)/(.*)"
+        - "traefik.http.middlewares.${STACK_NAME}-redirecthostname.redirectregex.replacement=https://${DOMAIN}/$${2}"
+        - "traefik.http.middlewares.${STACK_NAME}-redirecthostname.redirectregex.permanent=true"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
         - "coop-cloud.${STACK_NAME}.version=3.0.2+1.10.3"
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
@@ -74,7 +77,7 @@ networks:
     external: true
 configs:
   config_json:
-    name: ${STACK_NAME}_config_${ENTRYPOINT_CONF_VERSION}
+    name: ${STACK_NAME}_config_json_${CONFIG_JSON_VERSION}
     file: config.json.tmpl
     template_driver: golang
   entrypoint_conf: