diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile
index d3ab62121..20184bb2a 100644
--- a/Dockerfiles/build-base/alpine/Dockerfile
+++ b/Dockerfiles/build-base/alpine/Dockerfile
@@ -24,11 +24,8 @@ RUN set -eux && \
         x86) \
             openjdk_packages='openjdk8 openjdk8-jre-base'; \
             ;; \
-        armv7) \
-            openjdk_packages='openjdk8 openjdk8-jre-base'; \
-            ;; \
-        ppc64le) \
-            openjdk_packages='openjdk11 openjdk11-jre-headless'; \
+        riscv64) \
+            openjdk_packages='openjdk21 openjdk21-jre-headless'; \
             ;; \
         *) openjdk_packages='openjdk17 openjdk17-jre-headless'; \
     esac; \
diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile
index 3de68a39b..74435344a 100644
--- a/Dockerfiles/java-gateway/alpine/Dockerfile
+++ b/Dockerfiles/java-gateway/alpine/Dockerfile
@@ -35,11 +35,8 @@ RUN set -eux && \
         x86) \
             openjdk_packages='openjdk8-jre-base'; \
             ;; \
-        armv7) \
-            openjdk_packages='openjdk8 openjdk8-jre-base'; \
-            ;; \
-        ppc64le) \
-            openjdk_packages='openjdk11-jre-headless'; \
+        riscv64) \
+            openjdk_packages='openjdk21 openjdk21-jre-headless'; \
             ;; \
         *) openjdk_packages='openjdk17-jre-headless'; \
     esac; \
diff --git a/build.json b/build.json
index 935e23d86..b7646acc9 100644
--- a/build.json
+++ b/build.json
@@ -6,7 +6,8 @@
       "linux/arm/v7",
       "linux/arm64",
       "linux/s390x",
-      "linux/ppc64le"
+      "linux/ppc64le",
+      "linux/riscv64"
     ],
     "centos": [
       "linux/amd64",
@@ -25,7 +26,8 @@
       "linux/amd64",
       "linux/arm/v7",
       "linux/arm64",
-      "linux/s390x"
+      "linux/s390x",
+      "linux/riscv64"
     ]
   },
   "os-windows": {