diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml
index fd308d29d9..f94ef8bc0b 100644
--- a/.forgejo/workflows/ci.yaml
+++ b/.forgejo/workflows/ci.yaml
@@ -153,7 +153,7 @@ jobs:
           fetch-depth: 0
       - name: Build and Test
         run: sh ci/riscv64-linux-debug.sh
-        timeout-minutes: 660
+        timeout-minutes: 720
   riscv64-linux-release:
     if: github.event_name != 'pull_request'
     runs-on: [self-hosted, riscv64-linux]
@@ -164,7 +164,7 @@ jobs:
           fetch-depth: 0
       - name: Build and Test
         run: sh ci/riscv64-linux-release.sh
-        timeout-minutes: 540
+        timeout-minutes: 600
 
   s390x-linux-debug:
     runs-on: [self-hosted, s390x-linux]
diff --git a/ci/riscv64-linux-debug.sh b/ci/riscv64-linux-debug.sh
index 9774507d19..6eace21297 100755
--- a/ci/riscv64-linux-debug.sh
+++ b/ci/riscv64-linux-debug.sh
@@ -6,7 +6,7 @@ set -x
 set -e
 
 TARGET="riscv64-linux-musl"
-MCPU="spacemit_x60"
+MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-riscv64-linux-musl-0.16.0-dev.104+689461e31"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
 ZIG="$PREFIX/bin/zig"
diff --git a/ci/riscv64-linux-release.sh b/ci/riscv64-linux-release.sh
index 1fd57d7b1a..c3d28ee5e6 100755
--- a/ci/riscv64-linux-release.sh
+++ b/ci/riscv64-linux-release.sh
@@ -6,7 +6,7 @@ set -x
 set -e
 
 TARGET="riscv64-linux-musl"
-MCPU="spacemit_x60"
+MCPU="baseline"
 CACHE_BASENAME="zig+llvm+lld+clang-riscv64-linux-musl-0.16.0-dev.104+689461e31"
 PREFIX="$HOME/deps/$CACHE_BASENAME"
 ZIG="$PREFIX/bin/zig"