diff --git a/docker-compose.development.yml b/docker-compose.development.yml
index ad06bc27..4c1983fe 100644
--- a/docker-compose.development.yml
+++ b/docker-compose.development.yml
@@ -12,8 +12,6 @@ services:
         VITE_API_URL: https://metermanager-dev.pvacd.com/api/v1
     env_file:
       - ./frontend/.env.devserver
-    ports:
-      - "5173:80"
     depends_on:
       - api
       - traefik
@@ -22,7 +20,7 @@ services:
 
       # Current PVACD hostname
       - "traefik.http.routers.frontend.rule=Host(`metermanager-dev.pvacd.com`)"
-      - "traefik.http.routers.frontend.entrypoints=websecure,web"
+      - "traefik.http.routers.frontend.entrypoints=websecure"
       - "traefik.http.routers.frontend.tls=true"
       - "traefik.http.routers.frontend.tls.certresolver=myresolver"
 
@@ -38,9 +36,8 @@ services:
       - "traefik.http.middlewares.pvacd-redirect.redirectregex.replacement=https://metermanager-dev.pvacd.com/$${1}"
       - "traefik.http.middlewares.pvacd-redirect.redirectregex.permanent=true"
 
-      # - "traefik.http.routers.frontend-insecure.middlewares=force-secure"
-      # - "traefik.http.middlewares.force-secure.redirectscheme.scheme=https"
-      # - "traefik.http.middlewares.force-secure.redirectscheme.permanent=true"
+      - "traefik.http.routers.frontend.priority=10"
+      - "traefik.http.services.frontend.loadbalancer.server.port=80"
 
   api:
     build:
@@ -63,8 +60,6 @@ services:
       --port 8000
       --proxy-headers
       --root-path /api/v1
-    ports:
-      - "8000:8000"
     volumes:
       - ./api:/app/api
     depends_on:
@@ -73,24 +68,22 @@ services:
       - ./api/.env_devserver
     labels:
       - "traefik.enable=true"
+
       - "traefik.http.routers.api.rule=Host(`metermanager-dev.pvacd.com`) && PathPrefix(`/api/v1`)"
       - "traefik.http.routers.api.entrypoints=websecure"
       - "traefik.http.routers.api.tls=true"
       - "traefik.http.routers.api.tls.certresolver=myresolver"
+      - "traefik.http.routers.api.priority=100"
+
       - "traefik.http.routers.api.middlewares=api-sp"
       - "traefik.http.middlewares.api-sp.stripprefix.prefixes=/api/v1"
       - "traefik.http.middlewares.api-sp.stripprefix.forceSlash=false"
-      - "traefik.http.routers.api-insecure.rule=Host(`metermanager-dev.pvacd.com`) && PathPrefix(`/api/v1`)"
-      - "traefik.http.routers.api-insecure.entrypoints=web"
 
-      # - "traefik.http.routers.api-insecure.middlewares=force-secure"
-      # - "traefik.http.middlewares.force-secure.redirectscheme.scheme=https"
-      # - "traefik.http.middlewares.force-secure.redirectscheme.permanent=true"
+      - "traefik.http.services.api.loadbalancer.server.port=8000"
 
   traefik:
     image: "traefik:v2.11"
     command:
-      - "--api.insecure=true"
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
       - "--entrypoints.web.address=:80"
@@ -106,7 +99,6 @@ services:
     ports:
       - "80:80"
       - "443:443"
-      - "8080:8080"
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
       - ./letsencrypt:/letsencrypt
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index e627ca55..1f4bf8d9 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -12,8 +12,6 @@ services:
         VITE_API_URL: https://metermanager.pvacd.com/api/v1
     env_file:
       - ./frontend/.env.production
-    ports:
-      - "5173:80"
     depends_on:
       - api
       - traefik
@@ -22,7 +20,7 @@ services:
 
       # Current PVACD hostname
       - "traefik.http.routers.frontend.rule=Host(`metermanager.pvacd.com`)"
-      - "traefik.http.routers.frontend.entrypoints=websecure,web"
+      - "traefik.http.routers.frontend.entrypoints=websecure"
       - "traefik.http.routers.frontend.tls=true"
       - "traefik.http.routers.frontend.tls.certresolver=myresolver"
 
@@ -38,9 +36,8 @@ services:
       - "traefik.http.middlewares.pvacd-redirect.redirectregex.replacement=https://metermanager.pvacd.com/$${1}"
       - "traefik.http.middlewares.pvacd-redirect.redirectregex.permanent=true"
 
-      # - "traefik.http.routers.frontend-insecure.middlewares=force-secure"
-      # - "traefik.http.middlewares.force-secure.redirectscheme.scheme=https"
-      # - "traefik.http.middlewares.force-secure.redirectscheme.permanent=true"
+      - "traefik.http.routers.frontend.priority=10"
+      - "traefik.http.services.frontend.loadbalancer.server.port=80"
 
   api:
     build:
@@ -63,8 +60,6 @@ services:
       --port 8000
       --proxy-headers
       --root-path /api/v1
-    ports:
-      - "8000:8000"
     volumes:
       - ./api:/app/api
     depends_on:
@@ -73,24 +68,22 @@ services:
       - ./api/.env_production
     labels:
       - "traefik.enable=true"
+
       - "traefik.http.routers.api.rule=Host(`metermanager.pvacd.com`) && PathPrefix(`/api/v1`)"
       - "traefik.http.routers.api.entrypoints=websecure"
       - "traefik.http.routers.api.tls=true"
       - "traefik.http.routers.api.tls.certresolver=myresolver"
+      - "traefik.http.routers.api.priority=100"
+
       - "traefik.http.routers.api.middlewares=api-sp"
       - "traefik.http.middlewares.api-sp.stripprefix.prefixes=/api/v1"
       - "traefik.http.middlewares.api-sp.stripprefix.forceSlash=false"
-      - "traefik.http.routers.api-insecure.rule=Host(`metermanager.pvacd.com`) && PathPrefix(`/api/v1`)"
-      - "traefik.http.routers.api-insecure.entrypoints=web"
 
-      # - "traefik.http.routers.api-insecure.middlewares=force-secure"
-      # - "traefik.http.middlewares.force-secure.redirectscheme.scheme=https"
-      # - "traefik.http.middlewares.force-secure.redirectscheme.permanent=true"
+      - "traefik.http.services.api.loadbalancer.server.port=8000"
 
   traefik:
     image: "traefik:v2.11"
     command:
-      - "--api.insecure=true"
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
       - "--entrypoints.web.address=:80"
@@ -106,7 +99,6 @@ services:
     ports:
       - "80:80"
       - "443:443"
-      - "8080:8080"
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
       - ./letsencrypt:/letsencrypt