diff --git a/.github/workflows/cicd-main.yml b/.github/workflows/cicd-main.yml
index 54d81f46ee..e3bee5e7f6 100644
--- a/.github/workflows/cicd-main.yml
+++ b/.github/workflows/cicd-main.yml
@@ -83,10 +83,10 @@ jobs:
           if [[ "$DOCS_ONLY" == "true" || "$LABEL" == "CI:docs" ]]; then
             # For doc-only changes, run only doc tests
             TEST_LEVEL="docs"
-          elif [[ "$LABEL" == "CI:L0" || "$IS_PULLREQUEST" == "false" || "$MERGE_GROUP" == "true" ]]; then
-            # For labeled PRs, pushes to main (IS_PULL_REQUEST=false), or merge group events, run L0 by default
+          elif [[ "$LABEL" == "CI:L0" ]]; then
             TEST_LEVEL="L0"
-          elif [[ "$LABEL" == "CI:L1" ]]; then
+          elif [[ "$LABEL" == "CI:L1" || "$IS_PULLREQUEST" == "false" || "$MERGE_GROUP" == "true"  ]]; then
+            # For labeled PRs, pushes to main (IS_PULL_REQUEST=false), or merge group events, run L1 by default
             TEST_LEVEL="L1"
           elif [[ "$LABEL" == "CI:L2" ]]; then
             TEST_LEVEL="L2"
@@ -150,7 +150,7 @@ jobs:
     if: ${{ needs.pre-flight.outputs.test_level != 'none' }}
     with:
       RUNNER: self-hosted-azure
-      TIMEOUT: 45
+      TIMEOUT: 60
       UNIT_TEST_SCRIPT: |
         cd /opt/reinforcer
         if [[ "${{ needs.pre-flight.outputs.test_level }}" =~ ^(L0|L1|L2)$ ]]; then