diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 4228c5901..2e4f581f2 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -65,9 +65,6 @@ jobs:
           cd ..
           yarn install
 
-      - name: Install wait-on (temporary)
-        run: yarn add --no-lockfile wait-on
-
       - name: Cache cypress
         uses: actions/cache@v4
         with:
@@ -135,9 +132,9 @@ jobs:
           docker load -i /tmp/mailserver.tar || true
           docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach backend mailserver webapp
 
-      - name: Wait for webapp to be ready
+      - name: Wait for webapp
         run: |
-          npx wait-on http://localhost:3000 --timeout 120000
+          for i in {1..30}; do curl -sf http://localhost:3000 && exit 0 || sleep 2; done; exit 1
         
       - name: Full stack tests | run tests
         id: e2e-tests