diff --git a/.github/workflows/reusable-unit-split.yml b/.github/workflows/reusable-unit-split.yml
index 6c13670e7..4af18c726 100644
--- a/.github/workflows/reusable-unit-split.yml
+++ b/.github/workflows/reusable-unit-split.yml
@@ -130,7 +130,8 @@ jobs:
           --junitfile ${{env.TEST_RESULTS}}/gotestsum-report.xml -- \
           -tags="${{env.GOTAGS}}" -p 2 \
           ${GO_TEST_FLAGS-} \
-          -cover -coverprofile=coverage.txt
+          -cover -coverprofile=coverage.txt \
+          -timeout=30m
 
       # NOTE: ENT specific step as we store secrets in Vault.
       - name: Authenticate to Vault
diff --git a/.github/workflows/reusable-unit.yml b/.github/workflows/reusable-unit.yml
index c49a6291f..71f2fc6e2 100644
--- a/.github/workflows/reusable-unit.yml
+++ b/.github/workflows/reusable-unit.yml
@@ -108,7 +108,8 @@ jobs:
               --junitfile ${{env.TEST_RESULTS}}/gotestsum-report.xml -- \
               -tags="${{env.GOTAGS}}" \
               ${GO_TEST_FLAGS-} \
-              -cover -coverprofile=coverage.txt
+              -cover -coverprofile=coverage.txt \
+              -timeout=30m
 
       # NOTE: ENT specific step as we store secrets in Vault.
       - name: Authenticate to Vault