diff --git a/package-lists/build/userland.pkgs b/package-lists/build/userland.pkgs
index 50477d3..2e2b5f6 100644
--- a/package-lists/build/userland.pkgs
+++ b/package-lists/build/userland.pkgs
@@ -8,6 +8,8 @@
 #  - java8 is required by the saml app
 bcc
 java8
+make-jpkg
+adoptopenjdk
 
 delphix-sso-app
 bpftrace
diff --git a/packages/adoptopenjdk/config.sh b/packages/adoptopenjdk/config.sh
index c8f5f59..897e973 100644
--- a/packages/adoptopenjdk/config.sh
+++ b/packages/adoptopenjdk/config.sh
@@ -18,9 +18,13 @@
 
 DEFAULT_PACKAGE_GIT_URL=none
 tarfile="OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz"
+jdk_path="/usr/lib/jvm/adoptopenjdk-java8-jdk-amd64"
 
 function prepare() {
-	logmust "$TOP/buildpkg.sh" make-jpkg
+	if ! ls "$TOP/packages/make-jpkg/tmp/artifacts/"*.deb >/dev/null 2>&1; then
+		echo_bold "custom java-package not installed. Building package 'make-jpkg' first."
+		logmust "$TOP/buildpkg.sh" make-jpkg
+	fi
 }
 
 function fetch() {
@@ -28,13 +32,28 @@ function fetch() {
 
 	local url="http://artifactory.delphix.com/artifactory"
 
-	wget -nv "$url/java-binaries/linux/jdk/8/$tarfile" -O "$tarfile"
+	logmust wget -nv "$url/java-binaries/linux/jdk/8/$tarfile" -O "$tarfile"
 }
 
 function build() {
 	logmust cd "$WORKDIR/"
 
-	env DEB_BUILD_OPTIONS=nostrip fakeroot make-jpkg "$tarfile" <<<y
-
-	logmust mv ./*.deb artifacts/
+	logmust env DEB_BUILD_OPTIONS=nostrip fakeroot make-jpkg "$tarfile" <<<y
+
+	logmust mv ./*.deb "$WORKDIR/artifacts/"
+	#
+	# Store the install path of the JDK in a file so that the users of this
+	# Java package know where to look. This is especially useful for
+	# other linux-pkg packages that have a build dependency on this
+	# particular version of Java, as they don't have to hardcode the
+	# path in their build definition. This would also be useful if external
+	# packages, such as the app-gate, decide to fetch and install Java from
+	# the Linux-pkg bundle.
+	#
+	logmust bash -c "echo $jdk_path >'$WORKDIR/artifacts/JDK_PATH'"
+	#
+	# Install the Java package on this system so that other linux-pkg
+	# packages can use it.
+	#
+	logmust install_pkgs "$WORKDIR/artifacts/"*.deb
 }
diff --git a/packages/delphix-sso-app/config.sh b/packages/delphix-sso-app/config.sh
index e103de4..52ba040 100644
--- a/packages/delphix-sso-app/config.sh
+++ b/packages/delphix-sso-app/config.sh
@@ -17,13 +17,13 @@
 # shellcheck disable=SC2034
 
 DEFAULT_PACKAGE_GIT_URL="https://gitlab.delphix.com/app/saml-app.git"
-JDK_PATH_FILE="$TOP/packages/java8/tmp/artifacts/JDK_PATH"
+JDK_PATH_FILE="$TOP/packages/adoptopenjdk/tmp/artifacts/JDK_PATH"
 
 function prepare() {
-	java_package_exists=$(dpkg-query --show oracle-java8-jdk >/dev/null 2>&1)
+	java_package_exists=$(dpkg-query --show adoptopenjdk-java8-jdk >/dev/null 2>&1)
 	if [[ ! $java_package_exists && ! -f $JDK_PATH_FILE ]]; then
-		echo_bold "java8 not installed. Building package 'java8' first."
-		logmust "$TOP/buildpkg.sh" java8
+		echo_bold "java8 not installed. Building package 'adoptopenjdk' first."
+		logmust "$TOP/buildpkg.sh" adoptopenjdk
 	fi
 }