diff --git a/hosts/ps10rp/gitea/compose.yaml b/hosts/ps10rp/gitea/compose.yaml
index 04a2e7dd0..d4db9dfea 100644
--- a/hosts/ps10rp/gitea/compose.yaml
+++ b/hosts/ps10rp/gitea/compose.yaml
@@ -45,7 +45,7 @@ services:
         labels:
             traefik.enable: true
             traefik.docker.network: internal
-            traefik.http.routers.gitea.entrypoints: websecure
+            traefik.http.routers.gitea.entrypoints: web-secure
             traefik.http.routers.gitea.rule: Host(`gitea.lebens-home.net`)
             traefik.http.routers.gitea.service: gitea
             traefik.http.services.gitea.loadbalancer.server.port: 3000
diff --git a/hosts/ps10rp/homepage/compose.yaml b/hosts/ps10rp/homepage/compose.yaml
index 49d9af74a..68cf70272 100644
--- a/hosts/ps10rp/homepage/compose.yaml
+++ b/hosts/ps10rp/homepage/compose.yaml
@@ -37,7 +37,7 @@ services:
         labels:
             traefik.enable: true
             traefik.docker.network: internal
-            traefik.http.routers.homepage.entrypoints: websecure
+            traefik.http.routers.homepage.entrypoints: web-secure
             traefik.http.routers.homepage.rule: Host(`www.lebens-home.net`)
             traefik.http.routers.homepage.service: homepage
             traefik.http.services.homepage.loadbalancer.server.port: 3000
diff --git a/hosts/ps10rp/traefik/compose.yaml b/hosts/ps10rp/traefik/compose.yaml
index 29d3482ec..2ff813446 100644
--- a/hosts/ps10rp/traefik/compose.yaml
+++ b/hosts/ps10rp/traefik/compose.yaml
@@ -38,6 +38,7 @@ services:
             - "--entryPoints.web-secure.http.tls.certResolver=cloudflare"
             - "--entryPoints.web-secure.http.tls.domains[0].main=*.lebens-home.net"
             - "--entryPoints.web-secure.http.tls.domains[0].sans[0]=lebens-home.net"
+            - "--entryPoints.traefik.address=:8080"
             - "--certificatesresolvers.cloudflare.acme.dnschallenge=true"
             - "--certificatesresolvers.cloudflare.acme.dnschallenge.provider=cloudflare"
             - "--certificatesresolvers.cloudflare.acme.dnschallenge.delaybeforecheck=10"
@@ -49,7 +50,7 @@ services:
             - "--metrics.prometheus.addEntryPointsLabels=true"
             - "--metrics.prometheus.addRoutersLabels=true"
             - "--metrics.prometheus.addServicesLabels=true"
-            - "--metrics.prometheus.entryPoint=web-secure"
+            - "--metrics.prometheus.entryPoint=traefik"
             - "--metrics.prometheus.manualRouting=true"
         env_file:
             - .env
@@ -58,16 +59,12 @@ services:
         labels:
             traefik.enable: true
             traefik.docker.network: internal
-            traefik.http.routers.dashboard.entrypoints: web-secure
+            traefik.http.routers.dashboard.entrypoints: traefik
             traefik.http.routers.dashboard.rule: (Host(`traefik-ps10rp.lebens-home.net`) && (PathPrefix(`/api/`) || PathPrefix(`/dashboard/`)))
             traefik.http.routers.dashboard.service: api@internal
-            traefik.http.routers.dashboard.tls: true
-            traefik.http.routers.dashboard.tls.certresolver: cloudflare
-            traefik.http.routers.metrics.entrypoints: web-secure
+            traefik.http.routers.metrics.entrypoints: traefik
             traefik.http.routers.metrics.rule: (Host(`traefik-ps10rp.lebens-home.net`) && Path(`/metrics`))
             traefik.http.routers.metrics.service: prometheus@internal
-            traefik.http.routers.metrics.tls: true
-            traefik.http.routers.metrics.tls.certresolver: cloudflare
         networks:
             internal: null
         ports: