diff --git a/adoptopenjdk-api-v3-frontend/src/main/resources/JSON/platforms.json b/adoptopenjdk-api-v3-frontend/src/main/resources/JSON/platforms.json
index d3f2201a..87bfb29d 100644
--- a/adoptopenjdk-api-v3-frontend/src/main/resources/JSON/platforms.json
+++ b/adoptopenjdk-api-v3-frontend/src/main/resources/JSON/platforms.json
@@ -250,6 +250,24 @@
       "checksumAutoCommandHint": " (the command must be run on a terminal in the same directory you download the binary file)",
       "checksumAutoCommand": "curl -O -L FILEHASHURL && shasum -a 256 -c FILEHASHNAME",
       "osDetectionString": "not-to-be-detected"
+    },
+    {
+      "officialName": "Linux riscv64",
+      "searchableName": "RISCV64_LINUX",
+      "attributes": {
+        "heapSize": "normal",
+        "os": "linux",
+        "architecture": "riscv64"
+      },
+      "logo": "riscv.png",
+      "binaryExtension": ".tar.gz",
+      "installerExtension": "no-installer-available",
+      "installCommand": "tar -xf FILENAME",
+      "pathCommand": "export PATH=$PWD/DIRNAME/bin:$PATH",
+      "checksumCommand": "sha256sum FILENAME",
+      "checksumAutoCommandHint": " (the command must be run on a terminal in the same directory you download the binary file)",
+      "checksumAutoCommand": "wget -O- -q -T 1 -t 1 FILEHASHURL | sha256sum -c",
+      "osDetectionString": "not-to-be-detected"
     }
   ]
 }
diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt
index 6bf2df00..198f89a4 100644
--- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt
+++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt
@@ -105,6 +105,9 @@ class AssetsResourceFeatureReleasePathTest : AssetsPathTest() {
             version == 8 && element == ImageType.testimage ||
             version == 11 && element == ImageType.testimage ||
             version == 12 && element == ImageType.testimage ||
+
+            element == Architecture.riscv64 || // Temporary until riscv ga
+
             element == ImageType.debugimage ||
             element == ImageType.staticlibs
     }
diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt
index b5d38b1a..a539d1ee 100644
--- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt
+++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt
@@ -81,6 +81,9 @@ class AssetsResourceVersionPathTest : AssetsPathTest() {
                 versionRange.equals(JAVA11) && element == Architecture.sparcv9 ||
                 versionRange.equals(JAVA11) && element == ImageType.testimage ||
                 versionRange.equals(BELOW_11) && element == ImageType.testimage ||
+
+                element == Architecture.riscv64 || // Temporary until riscv ga
+
                 element == ImageType.debugimage ||
                 element == ImageType.staticlibs
     }
diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt
index 2a69e13c..6b76445e 100644
--- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt
+++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonCreator
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType
 import org.eclipse.microprofile.openapi.annotations.media.Schema
 
-@Schema(type = SchemaType.STRING, enumeration = ["x64", "x32", "ppc64", "ppc64le", "s390x", "aarch64", "arm", "sparcv9"])
+@Schema(type = SchemaType.STRING, enumeration = ["x64", "x32", "ppc64", "ppc64le", "s390x", "aarch64", "arm", "sparcv9", "riscv64"])
 enum class Architecture : FileNameMatcher {
     x64,
     x32("x86-32"),
@@ -13,7 +13,9 @@ enum class Architecture : FileNameMatcher {
     s390x,
     aarch64,
     arm("arm32"),
-    sparcv9;
+    sparcv9,
+    riscv64
+    ;
 
     override lateinit var names: List<String>