diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a55093d37a3beba98da68b5152ab89bac29a394..c3ef1c59ddd9c28b52241f4288a98ecf953f8f90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,12 @@ clean-up:
     - main
     - develop
   script:
-    - echo "Clean up "
-    - CONTAINER_ID=$(docker ps -q --filter "name=webserver-1")
+    - echo "Clean up"
+    - echo "Waiting for webserver to be running..."
+    - while ! curl -s http://localhost:8080/login | grep -q 'login'; do
+        echo 'Waiting for webserver...'; 
+        sleep 5; 
+      done;
+    - echo "Webserver is running"
+    - CONTAINER_ID=$(docker ps -q --filter "name=webserver")
     - docker exec -it $CONTAINER_ID airflow dags trigger train_model