diff --git a/docker-compose-gpu.yml b/docker-compose-gpu.yml
index 28371d024..11d0690cf 100644
--- a/docker-compose-gpu.yml
+++ b/docker-compose-gpu.yml
@@ -23,7 +23,7 @@ services:
       - DOCUMENTSTORE_PARAMS_HOST=elasticsearch
     depends_on:
       - elasticsearch
-    command: "/bin/bash -c 'sleep 15 && gunicorn rest_api.application:app -b 0.0.0.0 -k uvicorn.workers.UvicornWorker --workers 1 --timeout 180'"
+    command: "/bin/bash -c 'sleep 10 && gunicorn rest_api.application:app -b 0.0.0.0 -k uvicorn.workers.UvicornWorker --workers 1 --timeout 180'"
   elasticsearch:
     # This will start an empty elasticsearch instance (so you have to add your documents yourself)
     #image: "elasticsearch:7.9.2"
@@ -43,3 +43,4 @@ services:
     environment:
       - API_ENDPOINT=http://haystack-api:8000
       - EVAL_FILE=eval_labels_example.csv
+    command: "/bin/bash -c 'sleep 15 && streamlit run webapp.py'"
diff --git a/docker-compose.yml b/docker-compose.yml
index 0268a6b92..fb8c2aa9e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - DOCUMENTSTORE_PARAMS_HOST=elasticsearch
     depends_on:
       - elasticsearch
-    command: "/bin/bash -c 'sleep 15 && gunicorn rest_api.application:app -b 0.0.0.0 -k uvicorn.workers.UvicornWorker --workers 1 --timeout 180'"
+    command: "/bin/bash -c 'sleep 10 && gunicorn rest_api.application:app -b 0.0.0.0 -k uvicorn.workers.UvicornWorker --workers 1 --timeout 180'"
   elasticsearch:
     # This will start an empty elasticsearch instance (so you have to add your documents yourself)
     #image: "elasticsearch:7.9.2"
@@ -35,3 +35,4 @@ services:
     environment:
       - API_ENDPOINT=http://haystack-api:8000
       - EVAL_FILE=eval_labels_example.csv
+    command: "/bin/bash -c 'sleep 15 && streamlit run webapp.py'"