diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile
index f78c6f565..497102322 100644
--- a/Dockerfiles/build-base/alpine/Dockerfile
+++ b/Dockerfiles/build-base/alpine/Dockerfile
@@ -21,8 +21,8 @@ LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zab
 RUN set -eux && \
     ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
     case "$ARCH_SUFFIX" in \
-        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 6c8e1c505..c22daf929 100644
--- a/Dockerfiles/java-gateway/alpine/Dockerfile
+++ b/Dockerfiles/java-gateway/alpine/Dockerfile
@@ -32,8 +32,8 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}-output/java_gateway/sbin/", "/u
 RUN set -eux && \
     ARCH_SUFFIX="$(cat /etc/apk/arch)"; \
     case "$ARCH_SUFFIX" in \
-        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 65c6295a7..ab73cb2bb 100644
--- a/build.json
+++ b/build.json
@@ -4,7 +4,8 @@
       "linux/amd64",
       "linux/arm64",
       "linux/s390x",
-      "linux/ppc64le"
+      "linux/ppc64le",
+      "linux/riscv64"
     ],
     "centos": [
       "linux/amd64",
@@ -23,7 +24,8 @@
       "linux/amd64",
       "linux/arm/v7",
       "linux/arm64",
-      "linux/s390x"
+      "linux/s390x",
+      "linux/riscv64"
     ]
   },
   "os-windows": {