diff --git a/BFF/Dockerfile b/BFF/Dockerfile
index 703510c1b..614b6f73a 100644
--- a/BFF/Dockerfile
+++ b/BFF/Dockerfile
@@ -20,6 +20,8 @@ FROM alpine:3.16
 
 WORKDIR /bin
 
+RUN apk update && apk add gettext
+
 COPY --from=build /build/ogree-bff .
 COPY --from=build /build/api.json .
 COPY --from=build /build/swagger.json .
diff --git a/deploy/docker/bff_api_list.json b/deploy/docker/bff_api_list.json
index 139d9e276..f31ccf2a6 100644
--- a/deploy/docker/bff_api_list.json
+++ b/deploy/docker/bff_api_list.json
@@ -1,4 +1,4 @@
 [
-    {"name":"server", "url": "http://ogree-core_arango_api:8080"},
-    {"name":"objects", "url": "http://ogree-core_api:3001"}
+    {"name":"server", "url": "http://${COMPOSE_PROJECT_NAME}_arango_api:8080"},
+    {"name":"objects", "url": "http://${COMPOSE_PROJECT_NAME}_api:3001"}
 ]
\ No newline at end of file
diff --git a/deploy/docker/docker-compose.yml b/deploy/docker/docker-compose.yml
index b0dd399f7..74875805e 100644
--- a/deploy/docker/docker-compose.yml
+++ b/deploy/docker/docker-compose.yml
@@ -108,12 +108,18 @@ services:
       - BFF_PORT=${BFF_PORT}
       - BFF_SECRET=${AUTH_SECRET}
     volumes:
-      - ${BFF_API_LIST}:/bin/api.json
+      - ${BFF_API_LIST}:/bin/api0.json
     depends_on:
       - ogree_api
       - arango_api
     ports:
       - ${BFF_PORT}:${BFF_PORT}
+    entrypoint: >
+      sh -c "
+      export COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} &&
+      envsubst < /bin/api0.json > /bin/api.json &&
+      /bin/ogree-bff
+      "
 
 volumes:
   db: