diff --git a/forgejo/docker-compose.yml b/forgejo/docker-compose.yml
index a1794d9..c1bca41 100644
--- a/forgejo/docker-compose.yml
+++ b/forgejo/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     labels:
       - traefik.enable=true
       - traefik.http.routers.forgejo.rule=Host(`${TRAEFIK_DOMAIN}`)
-      - traefik.http.routers.forgejo.entrypoints=websecure-external
+      - traefik.http.routers.forgejo.entrypoints=${TRAEFIK_ENTRYPOINT}
       - traefik.http.services.forgejo.loadbalancer.server.port=3000
     volumes:
       - ${APPDATA_PATH}/forgejo/config:/etc/gitea
@@ -15,7 +15,7 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - ${SERVER_PORT}:3000
+      - ${PORT}:3000
     networks:
       - frontend
 
diff --git a/homeassistant/docker-compose.yml b/homeassistant/docker-compose.yml
index 267728c..3eff681 100644
--- a/homeassistant/docker-compose.yml
+++ b/homeassistant/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     labels:
       - traefik.enable=true
       - traefik.http.routers.homeassistant.rule=Host(`${TRAEFIK_DOMAIN}`)
-      - traefik.http.routers.homeassistant.entrypoints=websecure-external
+      - traefik.http.routers.homeassistant.entrypoints=${TRAEFIK_ENTRYPOINT}
       - traefik.http.services.homeassistant.loadbalancer.server.port=8123
     volumes:
       - ${APPDATA_PATH}/homeassistant/config:/config
diff --git a/mazanoke/docker-compose.yml b/mazanoke/docker-compose.yml
index 8dde29a..8fb64f7 100644
--- a/mazanoke/docker-compose.yml
+++ b/mazanoke/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     labels:
       - traefik.enable=true
       - traefik.http.routers.mazanoke.rule=Host(`${TRAEFIK_DOMAIN}`)
-      - traefik.http.routers.mazanoke.entrypoints=websecure
+      - traefik.http.routers.mazanoke.entrypoints=${TRAEFIK_ENTRYPOINT}
       - traefik.http.services.mazanoke.loadbalancer.server.port=80
     ports:
       - ${PORT}:80
diff --git a/minio/docker-compose.yml b/minio/docker-compose.yml
index 6952f1c..02b6c5f 100644
--- a/minio/docker-compose.yml
+++ b/minio/docker-compose.yml
@@ -7,14 +7,14 @@ services:
     user: ${PUID}:${PGID}
     labels:
       - traefik.enable=true
-      - traefik.http.routers.minio.rule=Host(`${TRAEFIK_DOMAIN_MINIO}`)
-      - traefik.http.routers.minio.entrypoints=websecure-external
+      - traefik.http.routers.minio.rule=Host(`${TRAEFIK_MINIO_DOMAIN}`)
+      - traefik.http.routers.minio.entrypoints=${TRAEFIK_MINIO_ENTRYPOINT}
       - traefik.http.services.minio.loadbalancer.server.port=9000
     environment:
       - MINIO_ROOT_USER=${MINIO_ROOT_USER}
       - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD}
-      - MINIO_SERVER_URL=${MINIO_SERVER_URL}
-      - MINIO_BROWSER_REDIRECT_URL=${MINIO_BROWSER_REDIRECT_URL}
+      - MINIO_SERVER_URL=https://${TRAEFIK_MINIO_DOMAIN}
+      - MINIO_BROWSER_REDIRECT_URL=https://${TRAEFIK_CONSOLE_DOMAIN}
     volumes:
       - ${APPDATA_PATH}/minio/data:/data
     ports:
@@ -37,8 +37,8 @@ services:
         condition: service_healthy
     labels:
       - traefik.enable=true
-      - traefik.http.routers.minio-console.rule=Host(`${TRAEFIK_DOMAIN_CONSOLE}`)
-      - traefik.http.routers.minio-console.entrypoints=websecure
+      - traefik.http.routers.minio-console.rule=Host(`${TRAEFIK_CONSOLE_DOMAIN}`)
+      - traefik.http.routers.minio-console.entrypoints=${TRAEFIK_CONSOLE_ENTRYPOINT}
       - traefik.http.services.minio-console.loadbalancer.server.port=9090
     environment:
       - CONSOLE_MINIO_SERVER=http://minio:9000