diff --git a/.github/workflows/build-packages.yaml b/.github/workflows/build-packages.yaml
index b3f1b40f3..05b465e3b 100644
--- a/.github/workflows/build-packages.yaml
+++ b/.github/workflows/build-packages.yaml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   build:
+    timeout-minutes: 10
     name: Build Packages
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/diagnostics-image-build.yaml b/.github/workflows/diagnostics-image-build.yaml
index a5d08bfa2..f50a0fe9a 100644
--- a/.github/workflows/diagnostics-image-build.yaml
+++ b/.github/workflows/diagnostics-image-build.yaml
@@ -8,6 +8,7 @@ concurrency: ${{ github.workflow }}-${{ github.ref }}
 jobs:
   build-docker-image:
     name: Build diagnostics-app Docker Image
+    timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
diff --git a/.github/workflows/test-isolated.yaml b/.github/workflows/test-isolated.yaml
index c0b01e395..31b643c83 100644
--- a/.github/workflows/test-isolated.yaml
+++ b/.github/workflows/test-isolated.yaml
@@ -8,6 +8,7 @@ jobs:
   test:
     name: Test Isolated Demos
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/test-simulators.yaml b/.github/workflows/test-simulators.yaml
index a3077a756..e321862d1 100644
--- a/.github/workflows/test-simulators.yaml
+++ b/.github/workflows/test-simulators.yaml
@@ -28,6 +28,7 @@ jobs:
     needs: check-changes
     if: ${{ needs.check-changes.outputs.should_run == 'true' }}
     runs-on: ubuntu-xl
+    timeout-minutes: 30
     env:
       AVD_NAME: ubuntu-avd-x86_64-31
     steps:
@@ -132,6 +133,7 @@ jobs:
     needs: check-changes
     if: ${{ needs.check-changes.outputs.should_run == 'true' }}
     runs-on: macOS-15
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e422e0761..1d8892809 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,6 +8,7 @@ jobs:
   test:
     name: Test Packages
     runs-on: ubuntu-xl
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
         with: