diff --git a/21/rhel/ubi9/hotspot/Dockerfile b/21/rhel/ubi9/hotspot/Dockerfile
index c935d7462c..5998abfa16 100644
--- a/21/rhel/ubi9/hotspot/Dockerfile
+++ b/21/rhel/ubi9/hotspot/Dockerfile
@@ -1,18 +1,9 @@
-FROM registry.access.redhat.com/ubi9/ubi:9.3-1361 as jre-build
-ARG JAVA_VERSION=21.0.2_13
 ARG TARGETPLATFORM
+ARG JAVA_VERSION=21.0.2_13
+FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-ubi9-minimal as jre-build
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-RUN set -x; yum install -y jq wget \
-  && JAVA_MAJOR_VERSION=$(echo "$JAVA_VERSION" | cut -d'+' -f1 | cut -d'.' -f1) \
-  && ENCODED_JAVA_VERSION=$(echo "$JAVA_VERSION" | jq "@uri" -jRr) \
-  && CONVERTED_ARCH=$(arch | sed 's/x86_64/x64/') \
-  && wget --quiet https://github.com/adoptium/temurin"${JAVA_MAJOR_VERSION}"-binaries/releases/download/jdk-"${ENCODED_JAVA_VERSION}"/OpenJDK"${JAVA_MAJOR_VERSION}"U-jdk_"${CONVERTED_ARCH}"_linux_hotspot_"${JAVA_VERSION}".tar.gz
-  && yum clean all \
-  && tar -xzf /tmp/jdk.tar.gz -C /opt/ \
-  && rm -f /tmp/jdk.tar.gz
-
 ENV PATH=/opt/jdk-${JAVA_VERSION}/bin:$PATH
 
 RUN jlink \