diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d840449747a..65134cd34ce 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   deploy:
     runs-on: dspace-dep-1
+    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v3
         with:
@@ -42,6 +43,7 @@ jobs:
 
   deploy-import:
     runs-on: dspace-dep-1
+    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
 
@@ -49,7 +51,7 @@ jobs:
         working-directory: build-scripts/run/
         run: |
           ENVFILE=/opt/dspace-envs/.env.dspace.imported.dev-5 ./start.sh dspace-5-import
-          sleep 120
+          /bin/bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://dev-5.pc:88/server/api)" != "200" ]]; do sleep 5; done'
 
   post-deploy-import:
     needs: deploy-import
diff --git a/.github/workflows/erase_db.yml b/.github/workflows/erase_db.yml
index 86c9934373d..53a02f7459d 100644
--- a/.github/workflows/erase_db.yml
+++ b/.github/workflows/erase_db.yml
@@ -19,9 +19,10 @@ on:
 
 jobs:
   recreate_db:
+    runs-on: dspace-dep-1
+    timeout-minutes: 5
     env:
       INSTANCE: ${{ inputs.INSTANCE }}
-    runs-on: dspace-dep-1
     steps:
 
       - name: stop and remove containers