diff --git a/MODULE.bazel b/MODULE.bazel
index a5853237..4c977bf4 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -72,6 +72,7 @@ JDKS = {
         "linux",
         "linux_aarch64",
         "linux_ppc64le",
+        "linux_riscv64",
         "linux_s390x",
         "macos",
         "macos_aarch64",
diff --git a/java/bazel/repositories_util.bzl b/java/bazel/repositories_util.bzl
index 7e9efbd2..fce641dc 100644
--- a/java/bazel/repositories_util.bzl
+++ b/java/bazel/repositories_util.bzl
@@ -82,7 +82,7 @@ _RELEASE_CONFIGS = {
         "adoptium": {
             "release": "21.0.4+7",
             "platforms": {
-                "linux": ["ppc", "s390x"],
+                "linux": ["ppc", "riscv64", "s390x"],
             },
         },
     },
diff --git a/java/repositories.bzl b/java/repositories.bzl
index f02b0f66..cb605439 100644
--- a/java/repositories.bzl
+++ b/java/repositories.bzl
@@ -310,6 +310,14 @@ _REMOTE_JDK_CONFIGS_LIST = [
         urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4+7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz", "https://mirror.bazel.build/github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4+7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz"],
         version = "21",
     ),
+    struct(
+        name = "remotejdk21_linux_riscv64",
+        target_compatible_with = ["@platforms//os:linux", "@platforms//cpu:riscv64"],
+        sha256 = "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da",
+        strip_prefix = "jdk-21.0.4+7",
+        urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4+7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz", "https://mirror.bazel.build/github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4+7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz"],
+        version = "21",
+    ),
     struct(
         name = "remotejdk21_linux_s390x",
         target_compatible_with = ["@platforms//os:linux", "@platforms//cpu:s390x"],
diff --git a/test/repo/MODULE.bazel b/test/repo/MODULE.bazel
index c582bf40..1be13d43 100644
--- a/test/repo/MODULE.bazel
+++ b/test/repo/MODULE.bazel
@@ -37,6 +37,7 @@ use_repo(
     "remotejdk17_win",
     "remotejdk17_win_arm64",
     "remotejdk21_linux",
+    "remotejdk21_linux_riscv64",
     "remotejdk21_macos",
     "remotejdk21_macos_aarch64",
     "remotejdk21_win",