diff --git a/Makefile b/Makefile
index 5a03b09..fdf16a3 100644
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,11 @@ help:
 .PHONY = env
 env:
 	@echo "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\n\nPOSTGRES_IP=10.42.0.19\nPOSTGRES_DB=Jodel" \
-		  > .backend-env
-	@echo "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\nKEYCLOAK_ADMIN=\nKEYCLOAK_ADMIN_PASSWORD=\n\n\nKC_HOSTNAME=keycloak.local.anxietyprime.de\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" \
-    	  > .keycloak-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" \
+          > $(ROOT_DIR).hostname
 
 .PHONY = gitsync
 gitsync: remove_dependencies
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 563d0cf..3aa41e3 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,9 +2,10 @@ services:
   keycloak:
     image: hub.anxietyprime.de/swa-jodel/keycloak:latest
     container_name: swa-keycloak
-    command: ["start-dev"]
+    command: ["start"]
     env_file:
       - ./.keycloak-env
+      - ./.hostname
     environment:
       KC_DB: postgres
       KC_DB_SCHEMA: public
@@ -45,6 +46,7 @@ services:
     container_name: swa-keycloak-db
     env_file:
       - ./.keycloak-env
+      - ./.hostname
     volumes:
       - ./keycloak-db/:/var/lib/postgresql/data
     expose: