diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fd07b9add4..667316d8b1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -50,6 +50,24 @@ jobs:
         uses: actions/checkout@v4
       - name: Build and Test
         run: sh ci/aarch64-linux-release.sh
+  riscv64-linux-debug:
+    if: github.event_name == 'push'
+    timeout-minutes: 360
+    runs-on: [self-hosted, Linux, riscv64]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Build and Test
+        run: sh ci/riscv64-linux-debug.sh
+  riscv64-linux-release:
+    if: github.event_name == 'push'
+    timeout-minutes: 360
+    runs-on: [self-hosted, Linux, riscv64]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Build and Test
+        run: sh ci/riscv64-linux-release.sh
   x86_64-macos-release:
     runs-on: "macos-13"
     env:
diff --git a/.github/workflows/riscv.yaml b/.github/workflows/riscv.yaml
deleted file mode 100644
index 5d4cc91c55..0000000000
--- a/.github/workflows/riscv.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: riscv
-on:
-  workflow_dispatch:
-permissions:
-  contents: read
-jobs:
-  riscv64-linux-debug:
-    timeout-minutes: 360
-    runs-on: [self-hosted, Linux, riscv64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Build and Test
-        run: sh ci/riscv64-linux-debug.sh
-  riscv64-linux-release:
-    timeout-minutes: 360
-    runs-on: [self-hosted, Linux, riscv64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Build and Test
-        run: sh ci/riscv64-linux-release.sh