diff --git a/elements/java/bin/setup-java-home b/elements/java/bin/setup-java-home
index a4f6bc30..f4c608f5 100755
--- a/elements/java/bin/setup-java-home
+++ b/elements/java/bin/setup-java-home
@@ -20,9 +20,12 @@ JRE_HOME=$1
 JDK_HOME=$2
 
 echo "export JAVA_HOME=$JRE_HOME" >> $JAVA_RC
-echo "export PATH=$JRE_HOME/bin:\$PATH" >> $JAVA_RC
 chmod +x $JAVA_RC
 
+echo "export PATH=$JRE_HOME/bin:\$PATH" >> $JAVA_BIN_RC
+echo "export PATH=$JDK_HOME/bin:\$PATH" >> $JAVA_BIN_RC
+chmod +x $JAVA_BIN_RC
+
 echo "Setting up alternatives for Java"
 
 case "$DISTRO_NAME" in
diff --git a/elements/java/cleanup.d/00-clean-java-vars b/elements/java/cleanup.d/00-clean-java-vars
index 6ce3426f..54e048f1 100755
--- a/elements/java/cleanup.d/00-clean-java-vars
+++ b/elements/java/cleanup.d/00-clean-java-vars
@@ -7,4 +7,5 @@ set -eu
 set -o pipefail
 
 unset DIB_JAVA_DISTRO
+unset JAVA_BIN_RC
 unset JAVA_RC
diff --git a/elements/java/environment.d/00-java-rc b/elements/java/environment.d/00-java-rc
index a6d43ad8..f2ecc947 100644
--- a/elements/java/environment.d/00-java-rc
+++ b/elements/java/environment.d/00-java-rc
@@ -1 +1,2 @@
 export JAVA_RC="/etc/profile.d/99-java.sh"
+export JAVA_BIN_RC="/etc/profile.d/98-java-bin.sh"