diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml
index bffc3dde9..d996d36f5 100644
--- a/.github/workflows/images_build.yml
+++ b/.github/workflows/images_build.yml
@@ -264,7 +264,7 @@ jobs:
          if-no-files-found: error
 
   build_images:
-    timeout-minutes: 60
+    timeout-minutes: 90
     needs: [ "build_base_database", "init_build"]
     name: Build ${{ matrix.build }} on ${{ matrix.os }}
     strategy:
diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile
index a3cf5d02b..e65e9353d 100644
--- a/Dockerfiles/build-mysql/rhel/Dockerfile
+++ b/Dockerfiles/build-mysql/rhel/Dockerfile
@@ -30,6 +30,19 @@ LABEL description="Zabbix build base for MySQL based images" \
       org.label-schema.vendor="Zabbix LLC"
 
 RUN set -eux && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        x86_64) \
+            additional_components='--enable-java'; \
+            ;; \
+        aarch64) \
+            additional_components='--enable-java'; \
+            ;; \
+        ppc64le) \
+            additional_components=''; \
+            ;; \
+        *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
+    esac; \
     cd /tmp/ && \
     git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
     cd /tmp/zabbix-${ZBX_VERSION} && \
@@ -47,7 +60,6 @@ RUN set -eux && \
             --enable-ipv6 \
             --enable-agent \
             --enable-agent2 \
-            --enable-java \
             --enable-proxy \
             --enable-server \
             --enable-webservice \
@@ -61,6 +73,7 @@ RUN set -eux && \
             --with-openssl \
             --with-ssh \
             --with-unixodbc \
+            $additional_components \
             --silent && \
     make -j"$(nproc)" -s dbschema && \
     make -j"$(nproc)" -s && \
diff --git a/Dockerfiles/build-sqlite3/rhel/Dockerfile b/Dockerfiles/build-sqlite3/rhel/Dockerfile
index 6e19eb131..38a220b3e 100644
--- a/Dockerfiles/build-sqlite3/rhel/Dockerfile
+++ b/Dockerfiles/build-sqlite3/rhel/Dockerfile
@@ -30,6 +30,19 @@ LABEL description="Zabbix build base for SQLite3 based images" \
       org.label-schema.vendor="Zabbix LLC"
 
 RUN set -eux && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        x86_64) \
+            additional_components='--enable-java'; \
+            ;; \
+        aarch64) \
+            additional_components='--enable-java'; \
+            ;; \
+        ppc64le) \
+            additional_components=''; \
+            ;; \
+        *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
+    esac; \
     cd /tmp/ && \
     git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
     cd /tmp/zabbix-${ZBX_VERSION} && \
@@ -47,7 +60,6 @@ RUN set -eux && \
             --enable-agent \
             --enable-agent2 \
             --enable-ipv6 \
-            --enable-java \
             --enable-proxy \
             --with-ldap \
             --with-libcurl \
@@ -59,6 +71,7 @@ RUN set -eux && \
             --with-sqlite3 \
             --with-ssh \
             --with-unixodbc \
+            $additional_components \
             --silent && \
     make -j"$(nproc)" -s dbschema && \
     make -j"$(nproc)" -s && \