diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 50c4f4ba..d6872590 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -6,6 +6,7 @@ on:
 jobs:
   e2ee_test:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     strategy:
       matrix:
         homeserver: [synapse, dendrite, conduit]
@@ -30,6 +31,7 @@ jobs:
 
   coverage_without_olm:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     env:
       NO_OLM: 1
     steps:
@@ -74,6 +76,7 @@ jobs:
   merge_converage:
     if: ${{ !cancelled() }}
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     needs: [coverage, coverage_without_olm]
     steps:
       - uses: actions/checkout@v4
@@ -103,6 +106,7 @@ jobs:
 
   dart_web_compatible:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
       - run: cat .github/workflows/versions.env >> $GITHUB_ENV
@@ -118,6 +122,7 @@ jobs:
 
   database_web_tests:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     env:
       NO_OLM: 1
     steps:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8640083b..6e47633c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -20,6 +20,7 @@ jobs:
       GH_TOKEN: ${{ github.token }}
     needs: [publish]
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: Create release