diff --git a/.github/workflows/build_maven_java21_riscv.yml b/.github/workflows/build_maven_java21_riscv.yml
new file mode 100644
index 0000000000000..b37934263f620
--- /dev/null
+++ b/.github/workflows/build_maven_java21_riscv.yml
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+name: "Build / Maven (Scala 2.13, JDK 21, RISC-V)"
+
+on:
+  schedule:
+    - cron: '0 15 */4 * *'
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  run-build:
+    permissions:
+      packages: write
+    name: Run
+    uses: ./.github/workflows/maven_test.yml
+    # if: github.repository == 'apache/spark'
+    with:
+      java: 21
+      os: ubuntu-24.04-riscv
+      arch: riscv64
diff --git a/.github/workflows/maven_test.yml b/.github/workflows/maven_test.yml
index b3198e3cbc75f..97df8abad9248 100644
--- a/.github/workflows/maven_test.yml
+++ b/.github/workflows/maven_test.yml
@@ -42,7 +42,7 @@ on:
         type: string
         default: ubuntu-latest
       arch:
-        description: The target architecture (x86, x64, arm64) of the Python interpreter.
+        description: The target architecture (x86, x64, arm64, riscv64) of the Python interpreter.
         required: false
         type: string
         default: x64
@@ -99,9 +99,9 @@ jobs:
           restore-keys: |
             maven-${{ runner.os }}-java${{ inputs.java }}-
       - name: Install Java ${{ inputs.java }}
-        uses: actions/setup-java@v6
+        uses: actions/setup-java@v5
         with:
-          distribution: zulu
+          distribution: ${{ case(inputs.arch == 'riscv64', 'temurin', 'zulu') }}
           java-version: ${{ inputs.java }}
       - name: Build Spark with Maven
         shell: |
@@ -243,9 +243,9 @@ jobs:
           restore-keys: |
             maven-${{ runner.os }}-java${{ matrix.java }}-
       - name: Install Java ${{ matrix.java }}
-        uses: actions/setup-java@v6
+        uses: actions/setup-java@v5
         with:
-          distribution: zulu
+          distribution: ${{ case(inputs.arch == 'riscv64', 'temurin', 'zulu') }}
           java-version: ${{ matrix.java }}
       - name: Install Python 3.12
         uses: actions/setup-python@v7