diff --git a/Makefile b/Makefile
index f4564ee..1293f8a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ FRONTEND=swa-jodel/frontend:latest
 BACKEND=swa-jodel/backend:latest
 DATABASE=swa-jodel/database:latest
 
-include $(ROOT_DIR).hostname
+-include $(ROOT_DIR).hostname
 
 help:
 	@echo "[HELP]"
@@ -29,7 +29,7 @@ env:
 		  > $(ROOT_DIR).backend-env
 	@echo "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\nKEYCLOAK_ADMIN=\nKEYCLOAK_ADMIN_PASSWORD=\n\n\nPOSTGRES_IP=10.42.0.11\nPOSTGRES_DB=keycloak\nKC_DB_URL_DATABASE=\$$POSTGRES_IP\nKC_DB_USERNAME=\$$POSTGRES_USER\nKC_DB_PASSWORD=\$$POSTGRES_PASSWORD" \
     	  > $(ROOT_DIR).keycloak-env
-	@echo "KC_HOSTNAME=keycloak.local.anxietyprime.de" \
+	@echo "KC_HOSTNAME=keycloak.local.anxietyprime.de\nJODEL_HOSTNAME=jodel.local.anxietyprime.de\nAPI_HOSTNAME=api.jodel.local.anxietyprime.de" \
           > $(ROOT_DIR).hostname
 
 .PHONY = gitsync
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 338ebf6..0c2fa90 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -25,9 +25,9 @@ services:
         ipv4_address: 10.42.0.10
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.keycloak.rule=Host(`keycloak.local.anxietyprime.de`)"
+      - "traefik.http.routers.keycloak.rule=Host($KC_HOSTNAME)"
       - "traefik.http.routers.keycloak.entrypoints=websecure"
-      - "traefik.http.routers.keycloak.tls.domains[0].main=keycloak.local.anxietyprime.de"
+      - "traefik.http.routers.keycloak.tls.domains[0].main=$KC_HOSTNAME"
       # - "traefik.http.routers.keycloak.tls.certresolver=letsencrypt"
       - "traefik.http.services.keycloak.loadbalancer.server.port=8080"
       - "traefik.http.routers.keycloak.service=keycloak"
@@ -71,9 +71,9 @@ services:
       swa-public:
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.web-jodel.rule=Host(`jodel.local.anxietyprime.de`)"
+      - "traefik.http.routers.web-jodel.rule=Host($JODEL_HOSTNAME)"
       - "traefik.http.routers.web-jodel.entrypoints=websecure"
-      - "traefik.http.routers.web-jodel.tls.domains[0].main=jodel.local.anxietyprime.de"
+      - "traefik.http.routers.web-jodel.tls.domains[0].main=$JODEL_HOSTNAME"
       # - "traefik.http.routers.web-jodel.tls.certresolver=letsencrypt"
       - "traefik.http.services.web-jodel.loadbalancer.server.port=80"
       - "traefik.http.routers.web-jodel.service=web-jodel"
@@ -103,9 +103,9 @@ services:
         ipv4_address: 10.42.0.18
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.api-jodel.rule=Host(`api.jodel.local.anxietyprime.de`)"
+      - "traefik.http.routers.api-jodel.rule=Host($API_HOSTNAME)"
       - "traefik.http.routers.api-jodel.entrypoints=websecure"
-      - "traefik.http.routers.api-jodel.tls.domains[0].main=api.jodel.local.anxietyprime.de"
+      - "traefik.http.routers.api-jodel.tls.domains[0].main=$API_HOSTNAME"
       # - "traefik.http.routers.api-jodel.tls.certresolver=letsencrypt"
       - "traefik.http.services.api-jodel.loadbalancer.server.port=8080"
       - "traefik.http.routers.api-jodel.service=api-jodel"