diff --git a/.github/workflows/riscv.yaml b/.github/workflows/riscv.yaml
index b5baf43a6d..5d4cc91c55 100644
--- a/.github/workflows/riscv.yaml
+++ b/.github/workflows/riscv.yaml
@@ -5,7 +5,7 @@ permissions:
   contents: read
 jobs:
   riscv64-linux-debug:
-    timeout-minutes: 1020
+    timeout-minutes: 360
     runs-on: [self-hosted, Linux, riscv64]
     steps:
       - name: Checkout
@@ -13,7 +13,7 @@ jobs:
       - name: Build and Test
         run: sh ci/riscv64-linux-debug.sh
   riscv64-linux-release:
-    timeout-minutes: 900
+    timeout-minutes: 360
     runs-on: [self-hosted, Linux, riscv64]
     steps:
       - name: Checkout