diff --git a/docker-compose-13b.yml b/docker-compose-13b.yml
index 13e4d0f..6797c74 100644
--- a/docker-compose-13b.yml
+++ b/docker-compose-13b.yml
@@ -14,3 +14,4 @@ services:
       - 'OPENAI_API_KEY=sk-XXXXXXXXXXXXXXXXXXXX'
       - 'OPENAI_API_HOST=http://llama-gpt-api:8000'
       - 'DEFAULT_MODEL=/models/llama-2-13b-chat.bin'
+      - 'WAIT_HOSTS=llama-gpt-api:8000'
diff --git a/docker-compose-70b.yml b/docker-compose-70b.yml
index 4ae318e..7500af5 100644
--- a/docker-compose-70b.yml
+++ b/docker-compose-70b.yml
@@ -14,3 +14,4 @@ services:
       - 'OPENAI_API_KEY=sk-XXXXXXXXXXXXXXXXXXXX'
       - 'OPENAI_API_HOST=http://llama-gpt-api:8000'
       - 'DEFAULT_MODEL=/models/llama-2-70b-chat.bin'
+      - 'WAIT_HOSTS=llama-gpt-api:8000'
diff --git a/docker-compose.yml b/docker-compose.yml
index e1e447a..a87c7a2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,3 +20,4 @@ services:
       - 'OPENAI_API_KEY=sk-XXXXXXXXXXXXXXXXXXXX'
       - 'OPENAI_API_HOST=http://llama-gpt-api:8000'
       - 'DEFAULT_MODEL=/models/llama-2-7b-chat.bin'
+      - 'WAIT_HOSTS=llama-gpt-api:8000'
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 6a79faf..9862658 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -22,8 +22,12 @@ COPY --from=build /app/package*.json ./
 COPY --from=build /app/next.config.js ./next.config.js
 COPY --from=build /app/next-i18next.config.js ./next-i18next.config.js
 
+## Add the wait script to the image
+COPY --from=ghcr.io/ufoscout/docker-compose-wait:latest /wait /wait
+
 # Expose the port the app will run on
 EXPOSE 3000
 
-# Start the application
-CMD ["npm", "start"]
+# Start the application after the API is ready
+CMD /wait && npm start
+