diff --git a/8u252/jdk/Dockerfile b/8u252/jdk/Dockerfile
index 14f0398..a656e1f 100644
--- a/8u252/jdk/Dockerfile
+++ b/8u252/jdk/Dockerfile
@@ -2,9 +2,11 @@ FROM colovu/ubuntu:18.04
 
 ENV JAVA_VERSION=8u252 \
 	JAVA_URL_VERSION=8u252b09 \
-	JAVA_BASE_URL="https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_" \
 	LANG=C.UTF-8 \
-	JAVA_HOME=/usr/local/openjdk-8 \
+	JAVA_HOME=/usr/local/openjdk-8
+
+ENV JDK_HOME="${JAVA_HOME}" \
+	CLASSPATH="${JAVA_HOME}/lib:${CLASSPATH}" \
 	PATH="/usr/local/openjdk-8/bin:${PATH}"
 
 LABEL \
@@ -37,6 +39,7 @@ RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt install -y --no-install-recommends ${fetchDeps}; \
 	\
+	JAVA_BASE_URL="https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_"; \
 	curl --progress-bar -L -o openjdk.tgz.asc "${JAVA_BASE_URL}x64_linux_${JAVA_URL_VERSION}.tar.gz.sign"; \
 	curl --progress-bar -L -o openjdk.tgz "${JAVA_BASE_URL}x64_linux_${JAVA_URL_VERSION}.tar.gz"; \
 	\
diff --git a/8u252/jre/Dockerfile b/8u252/jre/Dockerfile
index a112b15..5fc0d20 100644
--- a/8u252/jre/Dockerfile
+++ b/8u252/jre/Dockerfile
@@ -2,9 +2,11 @@ FROM colovu/ubuntu:18.04
 
 ENV JAVA_VERSION=8u252 \
 	JAVA_URL_VERSION=8u252b09 \
-	JAVA_BASE_URL="https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_" \
 	LANG=C.UTF-8 \
-	JAVA_HOME=/usr/local/openjdk-8 \
+	JAVA_HOME=/usr/local/openjdk-8
+
+ENV JRE_HOME="${JAVA_HOME}/jre" \
+	CLASSPATH="${JAVA_HOME}/lib:${JAVA_HOME}/jre/lib:${CLASSPATH}" \
 	PATH="/usr/local/openjdk-8/bin:/usr/local/openjdk-8/jre/bin:${PATH}"
 
 LABEL \
@@ -37,6 +39,7 @@ RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt install -y --no-install-recommends ${fetchDeps}; \
 	\
+	JAVA_BASE_URL="https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_"; \
 	curl --progress-bar -L -o openjdk.tgz.asc "${JAVA_BASE_URL}x64_linux_${JAVA_URL_VERSION}.tar.gz.sign"; \
 	curl --progress-bar -L -o openjdk.tgz "${JAVA_BASE_URL}x64_linux_${JAVA_URL_VERSION}.tar.gz"; \
 	\