diff --git a/.github/workflows/alpine-architecture-tests.yml b/.github/workflows/alpine-architecture-tests.yml
index 3dd37394..2d10d5b1 100644
--- a/.github/workflows/alpine-architecture-tests.yml
+++ b/.github/workflows/alpine-architecture-tests.yml
@@ -12,6 +12,7 @@ env:
 jobs:
   alpine-architecture-tests:
     runs-on: ubuntu-latest
+    timeout-minutes: 90
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml
index 428929dc..02661a4d 100644
--- a/.github/workflows/build-workflow.yml
+++ b/.github/workflows/build-workflow.yml
@@ -16,6 +16,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
 #pull wolfPKCS11
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 5b5498a7..ecb18668 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -29,6 +29,7 @@ on:
 jobs:
   clang-tidy:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 67ba3d29..89324407 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -10,6 +10,7 @@ jobs:
   build:
     if: github.repository_owner == 'wolfssl'
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
 # install cmake
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index 492cb9dc..2ddf46ad 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   codespell:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     
     steps:
     - name: Checkout code
diff --git a/.github/workflows/debian-package-test.yml b/.github/workflows/debian-package-test.yml
index 1f8c81e6..a0ad30c6 100644
--- a/.github/workflows/debian-package-test.yml
+++ b/.github/workflows/debian-package-test.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   debian-package-test:
     runs-on: ubuntu-22.04
+    timeout-minutes: 30
     
     steps:
     # Pull wolfPKCS11
diff --git a/.github/workflows/empty-pin-store-test.yml b/.github/workflows/empty-pin-store-test.yml
index efd8afa9..47dce310 100644
--- a/.github/workflows/empty-pin-store-test.yml
+++ b/.github/workflows/empty-pin-store-test.yml
@@ -16,6 +16,7 @@ env:
 jobs:
   empty-pin-store-test:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
     - name: Checkout wolfPKCS11
diff --git a/.github/workflows/firefox.yml b/.github/workflows/firefox.yml
index aed8c6e8..856625da 100644
--- a/.github/workflows/firefox.yml
+++ b/.github/workflows/firefox.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   test-firefox:
     runs-on: ubuntu-latest-m
+    timeout-minutes: 30
     container: wolfssl/wolfpkcs11-firefox-test:latest
     if: github.repository_owner == 'wolfssl'
     steps:
diff --git a/.github/workflows/nss-cmsutil-test.yml b/.github/workflows/nss-cmsutil-test.yml
index 955949c4..2f07f5b7 100644
--- a/.github/workflows/nss-cmsutil-test.yml
+++ b/.github/workflows/nss-cmsutil-test.yml
@@ -21,6 +21,7 @@ env:
 jobs:
   nss-cmsutil-test:
     runs-on: ubuntu-22.04
+    timeout-minutes: 60
 
     steps:
     - name: Checkout repository
diff --git a/.github/workflows/nss-curl-test.yml b/.github/workflows/nss-curl-test.yml
index 9987e3f7..7c84c2f6 100644
--- a/.github/workflows/nss-curl-test.yml
+++ b/.github/workflows/nss-curl-test.yml
@@ -21,6 +21,7 @@ env:
 jobs:
   test-nss-curl:
     runs-on: ubuntu-24.04
+    timeout-minutes: 60
     steps:
       - name: Checkout wolfPKCS11 repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/nss-pdfsig-test.yml b/.github/workflows/nss-pdfsig-test.yml
index a774cc21..5722ffa8 100644
--- a/.github/workflows/nss-pdfsig-test.yml
+++ b/.github/workflows/nss-pdfsig-test.yml
@@ -14,6 +14,7 @@ env:
 jobs:
   test-nss-pdf-signing:
     runs-on: ubuntu-22.04
+    timeout-minutes: 60
 
     steps:
     - name: Checkout wolfPKCS11 repository
diff --git a/.github/workflows/nss-pk12util-debian-test.yml b/.github/workflows/nss-pk12util-debian-test.yml
index 0944e13e..8beb2e38 100644
--- a/.github/workflows/nss-pk12util-debian-test.yml
+++ b/.github/workflows/nss-pk12util-debian-test.yml
@@ -19,6 +19,7 @@ env:
 jobs:
   nss-pk12util-debian-test:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     container:
       image: debian:bookworm
 
diff --git a/.github/workflows/nss-pk12util-test.yml b/.github/workflows/nss-pk12util-test.yml
index f871c804..6f255fe3 100644
--- a/.github/workflows/nss-pk12util-test.yml
+++ b/.github/workflows/nss-pk12util-test.yml
@@ -21,6 +21,7 @@ env:
 jobs:
   nss-pk12util-test:
     runs-on: ubuntu-22.04
+    timeout-minutes: 60
 
     steps:
     - name: Checkout repository
diff --git a/.github/workflows/nss-ssltap-test.yml b/.github/workflows/nss-ssltap-test.yml
index 6e1ad1bb..32f8ca62 100644
--- a/.github/workflows/nss-ssltap-test.yml
+++ b/.github/workflows/nss-ssltap-test.yml
@@ -21,6 +21,7 @@ env:
 jobs:
   nss-ssltap-test:
     runs-on: ubuntu-22.04
+    timeout-minutes: 60
 
     steps:
     - name: Checkout wolfPKCS11
diff --git a/.github/workflows/sanitizer-tests.yml b/.github/workflows/sanitizer-tests.yml
index a22e56d0..3eb3d00f 100644
--- a/.github/workflows/sanitizer-tests.yml
+++ b/.github/workflows/sanitizer-tests.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   sanitizer:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/scan-build.yml b/.github/workflows/scan-build.yml
index 7b69960e..e41cc984 100644
--- a/.github/workflows/scan-build.yml
+++ b/.github/workflows/scan-build.yml
@@ -31,6 +31,7 @@ on:
 jobs:
   scan-build:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/storage-upgrade-test-tpm.yml b/.github/workflows/storage-upgrade-test-tpm.yml
index dd5e8324..38796830 100644
--- a/.github/workflows/storage-upgrade-test-tpm.yml
+++ b/.github/workflows/storage-upgrade-test-tpm.yml
@@ -10,6 +10,7 @@ env:
 jobs:
   storage-upgrade-test-tpm:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     strategy:
       matrix:
         base-ref:
diff --git a/.github/workflows/storage-upgrade-test.yml b/.github/workflows/storage-upgrade-test.yml
index d5d483aa..6ed7b56b 100644
--- a/.github/workflows/storage-upgrade-test.yml
+++ b/.github/workflows/storage-upgrade-test.yml
@@ -10,6 +10,7 @@ env:
 jobs:
   storage-upgrade-test:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     strategy:
       matrix:
         base-ref:
diff --git a/.github/workflows/tpm2-store-test.yml b/.github/workflows/tpm2-store-test.yml
index 4ffa3865..45f2202b 100644
--- a/.github/workflows/tpm2-store-test.yml
+++ b/.github/workflows/tpm2-store-test.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   get_current_wolfssl_versions:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     outputs:
       wolfssl_versions: ${{ steps.json.outputs.wolfssl_versions }}
     steps:
@@ -22,6 +23,7 @@ jobs:
 
   get_current_wolftpm_versions:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     outputs:
       wolftpm_versions: ${{ steps.json.outputs.wolftpm_versions }}
     steps:
@@ -118,6 +120,7 @@ jobs:
 
   tpm2-store-test:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     needs: [build_wolfssl, build_wolftpm, get_current_wolfssl_versions, get_current_wolftpm_versions]
     strategy:
       matrix:
diff --git a/.github/workflows/wolfssl-master-compatibility.yml b/.github/workflows/wolfssl-master-compatibility.yml
index 039a7f53..77f7c83d 100644
--- a/.github/workflows/wolfssl-master-compatibility.yml
+++ b/.github/workflows/wolfssl-master-compatibility.yml
@@ -11,6 +11,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
 #pull wolfPKCS11
     - uses: actions/checkout@v4
diff --git a/.github/workflows/wolfssl-v5.6.6-build-workflow.yml b/.github/workflows/wolfssl-v5.6.6-build-workflow.yml
index 35f6cd1a..d3a9ebed 100644
--- a/.github/workflows/wolfssl-v5.6.6-build-workflow.yml
+++ b/.github/workflows/wolfssl-v5.6.6-build-workflow.yml
@@ -16,6 +16,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
 #pull wolfPKCS11