diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
index 36a60666ba..1a5c211672 100644
--- a/docker-compose.minimal.yml
+++ b/docker-compose.minimal.yml
@@ -332,9 +332,12 @@ services:
       - OTEL_SERVICE_NAME=loadgenerator
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
       - FLAGD_HOST
+      - FLAGD_PORT
     depends_on:
       frontend:
         condition: service_started
+      flagd:
+        condition: service_started
     logging: *logging
 
   # Payment service
diff --git a/docker-compose.yml b/docker-compose.yml
index 9e21adaa02..c52c34d37a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -413,9 +413,12 @@ services:
       - OTEL_SERVICE_NAME=loadgenerator
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
       - FLAGD_HOST
+      - FLAGD_PORT
     depends_on:
       frontend:
         condition: service_started
+      flagd:
+        condition: service_started
     logging: *logging
 
   # Payment service