diff --git a/srcpkgs/apache-ant/template b/srcpkgs/apache-ant/template
index f2e3365489d..f457fae0cef 100644
--- a/srcpkgs/apache-ant/template
+++ b/srcpkgs/apache-ant/template
@@ -18,16 +18,16 @@ _prefix=usr/share/apache-ant
 do_configure() {
 	# Disable tests
 	sed -i 's/jars,test-jar/jars/' build.xml
-	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	. /etc/profile.d/jdk.sh
 	./bootstrap.sh
 	bootstrap/bin/ant -Ddest=optional -f fetch.xml
 }
 do_build() {
-	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	. /etc/profile.d/jdk.sh
 	bootstrap/bin/ant -Ddist.dir=$DESTDIR/$_prefix jars
 }
 do_install() {
-	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
+	. /etc/profile.d/jdk.sh
 	bootstrap/bin/ant -Ddist.dir=$DESTDIR/$_prefix dist
 
 	vinstall ${FILESDIR}/apache-ant.sh 644 etc/profile.d
diff --git a/srcpkgs/apache-jmeter/template b/srcpkgs/apache-jmeter/template
index d9d79570957..71f570eae9c 100644
--- a/srcpkgs/apache-jmeter/template
+++ b/srcpkgs/apache-jmeter/template
@@ -18,7 +18,8 @@ esac
 
 do_build() {
 	# Tests fail -- they are too dependent on networking environment
-	JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ ./gradlew -PchecksumIgnore -x test createDist
+	. /etc/profile.d/jdk.sh
+	./gradlew -PchecksumIgnore -x test createDist
 }
 
 do_install() {
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index b1cfcac0b2a..ec54a09227d 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -28,8 +28,8 @@ do_build() {
 	. /etc/profile.d/apache-ant.sh
 	. /etc/profile.d/jdk.sh
 
-	export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include/linux"
-	export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include"
+	export CFLAGS+=" -I${XBPS_CROSS_BASE}/${JAVA_HOME}/include/linux"
+	export CFLAGS+=" -I${XBPS_CROSS_BASE}/${JAVA_HOME}/include"
 
 	mkdir -p build/linux/work/lib
 	cd ../astyle/build/gcc
diff --git a/srcpkgs/autofirma/template b/srcpkgs/autofirma/template
index fa0aed46a66..2d87e27fb67 100644
--- a/srcpkgs/autofirma/template
+++ b/srcpkgs/autofirma/template
@@ -18,7 +18,7 @@ checksum="40ebcd1200129ca08c21176a5fbd64c04ce0ac6bd932c4b213d4b7213f851a0d
 make_check=no
 
 do_build() {
-	export JAVA_HOME=/usr/lib/jvm/openjdk11
+	. /etc/profile.d/jdk.sh
 	cd "jmulticard-${_jmulticard_version}"
 	mvn clean install -Dmaven.test.skip=true
 	cd "../clienteafirma-${version}"
diff --git a/srcpkgs/bc-java/template b/srcpkgs/bc-java/template
index e14f4df68e1..aae98af4b0b 100644
--- a/srcpkgs/bc-java/template
+++ b/srcpkgs/bc-java/template
@@ -13,7 +13,7 @@ distfiles="https://github.com/bcgit/bc-java/archive/refs/tags/r${version/./rv}.t
 checksum=09659ee93ba2143d0db9107ddf515142f1d90e03d82d3e46a16e21e9eafeba84
 
 do_build() {
-	export JAVA_HOME=/usr/lib/jvm/openjdk17
+	. /etc/profile.d/jdk.sh
 	ant -f ant/jdk18+.xml clean build-provider build
 }
 
diff --git a/srcpkgs/java-commons-lang/template b/srcpkgs/java-commons-lang/template
index c06da268331..c42ccc02939 100644
--- a/srcpkgs/java-commons-lang/template
+++ b/srcpkgs/java-commons-lang/template
@@ -13,7 +13,7 @@ distfiles="https://archive.apache.org/dist/commons/lang/source/commons-lang3-${v
 checksum=bc007577652f7cda7d5dc8801f218f88396ea1981cb4482679e839f5781e3b60
 
 do_build() {
-	export JAVA_HOME=/usr/lib/jvm/openjdk17
+	. /etc/profile.d/jdk.sh
 	mvn -am -Dmaven.javadoc.skip=true -Dmaven.test.skip=true clean package
 }
 
diff --git a/srcpkgs/jep/template b/srcpkgs/jep/template
index 2fdc680ad6e..5a66cbe9914 100644
--- a/srcpkgs/jep/template
+++ b/srcpkgs/jep/template
@@ -13,8 +13,8 @@ changelog="https://github.com/ninia/jep/releases"
 distfiles="https://github.com/ninia/jep/archive/v${version}.tar.gz"
 checksum=152894b8323a905ba98281e26406856c4197f8a42f9839d01dacd98c4a6f1bff
 
-export JAVA_HOME=/usr/lib/jvm/openjdk17
-export LDFLAGS=-L${XBPS_CROSS_BASE}/usr/lib/jvm/openjdk17/lib/server
+. /etc/profile.d/jdk.sh
+export LDFLAGS="-L${XBPS_CROSS_BASE}/${JAVA_HOME}/lib/server"
 
 post_install() {
 	ln -sf jep.so ${DESTDIR}/${py3_sitelib}/jep/libjep.so
diff --git a/srcpkgs/libbluray/template b/srcpkgs/libbluray/template
index 03c9a8fd88c..82bc0e53ae1 100644
--- a/srcpkgs/libbluray/template
+++ b/srcpkgs/libbluray/template
@@ -22,15 +22,15 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
+	. /etc/profile.d/jdk.sh
 }
 
 pre_check() {
-	export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
+	. /etc/profile.d/jdk.sh
 }
 
 pre_install() {
-	export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
+	. /etc/profile.d/jdk.sh
 }
 
 libbluray-devel_package() {
diff --git a/srcpkgs/logisim-evolution/template b/srcpkgs/logisim-evolution/template
index 0900b160181..2fcf572a358 100644
--- a/srcpkgs/logisim-evolution/template
+++ b/srcpkgs/logisim-evolution/template
@@ -13,7 +13,7 @@ distfiles="https://github.com/logisim-evolution/logisim-evolution/archive/refs/t
 checksum=7a49558a490a0df886b3ea488f12e4ea887a2ec8c278872dca39b2bebfaed3ee
 
 do_build() {
-	export JAVA_HOME=/usr/lib/jvm/openjdk17
+	. /etc/profile.d/jdk.sh
 	gradle --no-daemon shadowJar
 }
 
diff --git a/srcpkgs/mandrel/template b/srcpkgs/mandrel/template
index 758abee76e7..11c4f28e516 100644
--- a/srcpkgs/mandrel/template
+++ b/srcpkgs/mandrel/template
@@ -27,7 +27,7 @@ nocross=yes
 do_build() {
 	cd mandrel-packaging-*
 	export PATH=/usr/libexec/chroot-git:$PATH
-	export JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}
+	. /etc/profile.d/jdk.sh
 	$JAVA_HOME/bin/java -ea build.java \
 		--mx-home $PWD/../mx-* \
 		--mandrel-repo $PWD/../mandrel-mandrel-* \
diff --git a/srcpkgs/pdftk-java/template b/srcpkgs/pdftk-java/template
index f04b33e2d16..171f80085d5 100644
--- a/srcpkgs/pdftk-java/template
+++ b/srcpkgs/pdftk-java/template
@@ -12,12 +12,12 @@ distfiles="https://gitlab.com/pdftk-java/pdftk/-/archive/v${version}/pdftk-v${ve
 checksum=9c947de54658539e3a136e39f9c38ece1cf2893d143abb7f5bf3a2e3e005b286
 
 do_build() {
-	export JAVA_HOME=/usr/lib/jvm/openjdk17
+	. /etc/profile.d/jdk.sh
 	gradle --no-daemon build
 }
 
 do_check() {
-	export JAVA_HOME=/usr/lib/jvm/openjdk17
+	. /etc/profile.d/jdk.sh
 	gradle --no-daemon test
 }
 
diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index f750d2d45db..ff9778d6a5a 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -29,7 +29,7 @@ post_extract() {
 
 do_build() {
 	export MAVEN_OPTS="$MAVEN_OPTS -Duser.home=$wrksrc"
-	export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
+	. /etc/profile.d/jdk.sh
 	for _i in . TuxGuitar-{lib,gm-utils} \
 		build-scripts/{tuxguitar,native-modules/tuxguitar-{alsa,oss,jack,fluidsynth}}-linux-$_arch; do
 		(