diff --git a/compose.yml b/compose.yml
index cc04a13..8cd8fa8 100644
--- a/compose.yml
+++ b/compose.yml
@@ -2,26 +2,10 @@
 version: "3.8"
 
 services:
-  mariadb:
-    image: mariadb
-    command: --max-allowed-packet=64MB
-    volumes:
-      - mariadb:/var/lib/mysql
-    environment:
-      - MYSQL_DATABASE=matomo
-      - MYSQL_USER=matomo
-      - MYSQL_PASSWORD_FILE=/run/secrets/db_password
-      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
-    networks:
-      - internal
-    secrets:
-      - db_root_password
-      - db_password
-
-  matomo:
+  app:
     image: matomo
     depends_on:
-      - mariadb
+      - db
     volumes:
       - "matomo_config:/var/www/html/config"
       - "matomo_logs:/var/www/html/logs"
@@ -44,11 +28,29 @@ services:
       labels:
         - "traefik.enable=true"
         - "traefik.docker.network=proxy"
-        - "traefik.http.routers.${STACK_NAME}.tls=true"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
-        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
+        - "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}"
+
+  db:
+    image: mysql:5.7
+    volumes:
+      - mariadb:/var/lib/mysql
+    environment:
+      - MYSQL_DATABASE=matomo
+      - MYSQL_USER=matomo
+      - MYSQL_PASSWORD_FILE=/run/secrets/db_password
+      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
+    networks:
+      - internal
+    secrets:
+      - db_root_password
+      - db_password
+    command: --max-allowed-packet=64MB
 
 volumes:
   mariadb: