diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index cf2721be33..8cde734eac 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -11,6 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 7cbc5c0d02..f50aa3f37c 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -12,6 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container: px4io/px4-dev-clang:2021-05-04
+    timeout-minutes: 60
     steps:
     - uses: actions/checkout@v1
       with:
diff --git a/.github/workflows/compile_linux.yml b/.github/workflows/compile_linux.yml
index 5c0d442a32..7a1b1d15e9 100644
--- a/.github/workflows/compile_linux.yml
+++ b/.github/workflows/compile_linux.yml
@@ -12,6 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container: px4io/px4-dev-armhf:2021-05-04
+    timeout-minutes: 60
     strategy:
       matrix:
         config: [
diff --git a/.github/workflows/compile_linux_arm64.yml b/.github/workflows/compile_linux_arm64.yml
index f5f0e423d3..54f5b1f3e5 100644
--- a/.github/workflows/compile_linux_arm64.yml
+++ b/.github/workflows/compile_linux_arm64.yml
@@ -12,6 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container: px4io/px4-dev-aarch64:2021-05-04
+    timeout-minutes: 60
     strategy:
       matrix:
         config: [
diff --git a/.github/workflows/compile_macos.yml b/.github/workflows/compile_macos.yml
index 83764400f9..f9b81a2ad8 100644
--- a/.github/workflows/compile_macos.yml
+++ b/.github/workflows/compile_macos.yml
@@ -11,6 +11,7 @@ on:
 jobs:
   build:
     runs-on: macos-10.15
+    timeout-minutes: 60
     strategy:
       matrix:
         config: [
diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml
index 6729b8ec48..6c6ab766ae 100644
--- a/.github/workflows/compile_nuttx.yml
+++ b/.github/workflows/compile_nuttx.yml
@@ -12,6 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container: px4io/px4-dev-nuttx-focal:2021-05-04
+    timeout-minutes: 60
     strategy:
       matrix:
         config: [
diff --git a/.github/workflows/compile_nuttx_cannode.yml b/.github/workflows/compile_nuttx_cannode.yml
index 670ce15618..6890cded60 100644
--- a/.github/workflows/compile_nuttx_cannode.yml
+++ b/.github/workflows/compile_nuttx_cannode.yml
@@ -12,6 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container: px4io/px4-dev-nuttx-focal:2021-05-04
+    timeout-minutes: 60
     strategy:
       matrix:
         config: [
diff --git a/.github/workflows/sitl_tests.yml b/.github/workflows/sitl_tests.yml
index 7709a1525e..4a0e09a0ad 100644
--- a/.github/workflows/sitl_tests.yml
+++ b/.github/workflows/sitl_tests.yml
@@ -11,6 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix: