diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 94c963a4..2f36053e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,6 +59,7 @@ jobs:
       # comments (to avoid publishing multiple comments in the same PR)
       contents: write
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     strategy:
       matrix:
         python-version: ["3.10"]
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 315c42e5..681eb4af 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -73,6 +73,7 @@ jobs:
   # Docker setup needs fixing before this is going to work: #1843
   test:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     needs: build
     steps:
     - name: Checkout repository