diff --git a/Makefile b/Makefile
index c308f4b..cc58757 100644
--- a/Makefile
+++ b/Makefile
@@ -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\nJODEL_HOSTNAME=jodel.local.anxietyprime.de\nAPI_HOSTNAME=api.jodel.local.anxietyprime.de\n\n\nPROXY_KC_HOSTNAME=\`\$$KC_HOSTNAME\`\nPROXY_JODEL_HOSTNAME=\`\$$JODEL_HOSTNAME\`\nPROXY_API_HOSTNAME=\`\$$API_HOSTNAME\`" \
+	@echo "KC_HOSTNAME=keycloak.local.anxietyprime.de\nJODEL_HOSTNAME=jodel.local.anxietyprime.de\nAPI_HOSTNAME=api.jodel.local.anxietyprime.de\n\n\nPROXY_KC_HOSTNAME=\`\$$KC_HOSTNAME\`\nPROXY_JODEL_HOSTNAME=\`\$$JODEL_HOSTNAME\`\nPROXY_API_HOSTNAME=\`\$$API_HOSTNAME\`\n\nREACT_APP_KC=\$$KC_HOSTNAME\nREACT_APP_API=\$$API_HOSTNAME" \
           > $(ROOT_DIR).env
 
 .PHONY = gitsync
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 217c8d4..1196d0d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -64,6 +64,8 @@ services:
   frontend:
     image: hub.anxietyprime.de/swa-jodel/frontend:latest
     container_name: swa-frontend
+    env_file:
+      - ./.env
     expose:
       - 80
     networks: