diff --git a/src/main/scala/io/sdkman/vendor/release/routes/PlatformMapper.scala b/src/main/scala/io/sdkman/vendor/release/routes/PlatformMapper.scala
index 9bf1498..d664504 100644
--- a/src/main/scala/io/sdkman/vendor/release/routes/PlatformMapper.scala
+++ b/src/main/scala/io/sdkman/vendor/release/routes/PlatformMapper.scala
@@ -12,6 +12,7 @@ object PlatformMapper extends LazyLogging {
     "LINUX_ARM32HF" -> "LINUX_ARM32HF",
     "LINUX_ARM32SF" -> "LINUX_ARM32SF",
     "LINUX_ARM64"   -> "LINUX_ARM64",
+    "LINUX_RISCV64" -> "LINUX_RISCV64",
     "WINDOWS_64"    -> "WINDOWS_X64",
     "UNIVERSAL"     -> "UNIVERSAL"
   )
diff --git a/src/main/scala/io/sdkman/vendor/release/routes/Validation.scala b/src/main/scala/io/sdkman/vendor/release/routes/Validation.scala
index 00b2c10..ba4d8e9 100644
--- a/src/main/scala/io/sdkman/vendor/release/routes/Validation.scala
+++ b/src/main/scala/io/sdkman/vendor/release/routes/Validation.scala
@@ -32,6 +32,7 @@ trait Validation {
     "LINUX_ARM64",
     "LINUX_ARM32SF",
     "LINUX_ARM32HF",
+    "LINUX_RISCV64",
     "MAC_OSX",
     "MAC_ARM64",
     "WINDOWS_64",
diff --git a/src/test/resources/features/release_platform_validation.feature b/src/test/resources/features/release_platform_validation.feature
index 13473ff..06168af 100644
--- a/src/test/resources/features/release_platform_validation.feature
+++ b/src/test/resources/features/release_platform_validation.feature
@@ -92,6 +92,20 @@ Feature: Release platform validation
     """
     Then the status received is 201 CREATED
 
+  Scenario: The Linux RISC-V 64 bit platform is valid
+    Given the existing default PLATFORM_SPECIFIC java version is 8u121-zulu
+    When a JSON POST on the /versions endpoint:
+    """
+          |{
+          |  "candidate" : "java",
+          |  "version" : "8u131",
+          |  "url" : "http://localhost:8080/zulu8.21.0.1-jdk8.0.131.tar.gz",
+          |  "platform" : "LINUX_RISCV64",
+          |  "vendor" : "zulu"
+          |}
+    """
+    Then the status received is 201 CREATED
+
   Scenario: The Mac OSX X64 platform is valid
     Given the existing default PLATFORM_SPECIFIC java version is 8u121-zulu
     When a JSON POST on the /versions endpoint:
diff --git a/src/test/scala/io/sdkman/vendor/release/routes/PlatformMapperSpec.scala b/src/test/scala/io/sdkman/vendor/release/routes/PlatformMapperSpec.scala
index ba28c16..052ffed 100644
--- a/src/test/scala/io/sdkman/vendor/release/routes/PlatformMapperSpec.scala
+++ b/src/test/scala/io/sdkman/vendor/release/routes/PlatformMapperSpec.scala
@@ -35,6 +35,10 @@ class PlatformMapperSpec extends AnyWordSpec with Matchers {
       PlatformMapper.mapToStatePlatform("LINUX_ARM64") shouldBe "LINUX_ARM64"
     }
 
+    "map LINUX_RISCV64 to LINUX_RISCV64" in {
+      PlatformMapper.mapToStatePlatform("LINUX_RISCV64") shouldBe "LINUX_RISCV64"
+    }
+
     "map WINDOWS_64 to WINDOWS_X64" in {
       PlatformMapper.mapToStatePlatform("WINDOWS_64") shouldBe "WINDOWS_X64"
     }