diff --git a/e2e_tests/run_e2e_tests.sh b/e2e_tests/run_e2e_tests.sh
index 6cd0efc7..ff97a146 100644
--- a/e2e_tests/run_e2e_tests.sh
+++ b/e2e_tests/run_e2e_tests.sh
@@ -46,7 +46,7 @@ log starting the arch gateway service
 log =================================
 docker compose -f docker-compose.e2e.yaml down
 log waiting for model service to be healthy
-wait_for_healthz "http://localhost:51000/healthz" 600
+wait_for_healthz "http://localhost:51000/healthz" 300
 kill $model_server_tail_pid
 docker compose -f docker-compose.e2e.yaml up -d
 log waiting for arch gateway service to be healthy
diff --git a/model_server/app/cli.py b/model_server/app/cli.py
index dd6a5679..014608b0 100644
--- a/model_server/app/cli.py
+++ b/model_server/app/cli.py
@@ -65,7 +65,7 @@ def start_server(port=51000):
         process.terminate()
 
 
-def wait_for_health_check(url, timeout=180):
+def wait_for_health_check(url, timeout=300):
     """Wait for the Uvicorn server to respond to health-check requests."""
     start_time = time.time()
     while time.time() - start_time < timeout: