diff --git a/.github/workflows/ci-e2e.yml b/.github/workflows/ci-e2e.yml
index 1f3f3593a..ab1d7dbcc 100644
--- a/.github/workflows/ci-e2e.yml
+++ b/.github/workflows/ci-e2e.yml
@@ -25,8 +25,8 @@ jobs:
           npm install
           npm build
           docker compose up -d
-          ./ci-wait-for-services.sh
         working-directory: ./e2e
+      - run: ./scripts/ci-wait-for-services.sh
       - name: E2E Suite A
         if: matrix.e2e == 'a'
         working-directory: ./e2e
diff --git a/.github/workflows/ci-server.yml b/.github/workflows/ci-server.yml
index bc81425ba..2c16d11b3 100644
--- a/.github/workflows/ci-server.yml
+++ b/.github/workflows/ci-server.yml
@@ -21,7 +21,9 @@ jobs:
       - name: Setup Environment
         run: ./scripts/ci-install.sh
       - name: Start Services
-        run: ./scripts/ci-start-services.sh
+        run: |
+          ./scripts/ci-start-services.sh
+          ./scripts/ci-wait-for-services.sh
       - name: Pytest
         run: pytest --log-level=ERROR --disable-warnings server/planning
   server-behave:
@@ -42,7 +44,9 @@ jobs:
       - name: Setup Environment
         run: ./scripts/ci-install.sh
       - name: Start Services
-        run: ./scripts/ci-start-services.sh
+        run: |
+          ./scripts/ci-start-services.sh
+          ./scripts/ci-wait-for-services.sh
       - name: Behave
         working-directory: ./server
         run: behave --format progress2 --logging-level=ERROR
@@ -66,6 +70,8 @@ jobs:
       - name: Setup Environment
         run: ./scripts/ci-install.sh
       - name: Start Services
-        run: ./scripts/ci-start-services.sh
+        run: |
+          ./scripts/ci-start-services.sh
+          ./scripts/ci-wait-for-services.sh
       - name: Pytest
         run: pytest --log-level=ERROR --disable-warnings server/tests/prod_api
diff --git a/scripts/ci-start-services.sh b/scripts/ci-start-services.sh
index 1a64e9faf..817d3921c 100755
--- a/scripts/ci-start-services.sh
+++ b/scripts/ci-start-services.sh
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 
 docker compose -f ./e2e/docker-compose.yml up elastic redis mongo -d
-./ci-wait-for-services.sh