diff --git a/java/build_jdk.sh b/java/build_jdk.sh
index 10c6ea4..1fd2ee5 100755
--- a/java/build_jdk.sh
+++ b/java/build_jdk.sh
@@ -11,17 +11,17 @@ makeopts_jobs() {
     echo ${jobs:-1}
 }
 
-version_jdk21=21.0.3+6
+version_jdk21=21.0.3+7
 version_jdk20=20.0.2+9
 version_jdk19=19.0.2+7
 version_jdk18=18.0.2.1+1
-version_jdk17=17.0.11+6
+version_jdk17=17.0.11+7
 version_jdk16=16.0.2+7
 version_jdk15=15.0.10+5
 version_jdk14=14.0.2+12
 version_jdk13=13.0.14+5
 version_jdk12=12.0.2+10
-version_jdk11=11.0.23+6
+version_jdk11=11.0.23+7
 version_jdk10=10.0.2+13
 version_jdk9=9+181
 
diff --git a/java/download.sh b/java/download.sh
index 858d670..1722d57 100755
--- a/java/download.sh
+++ b/java/download.sh
@@ -1,17 +1,17 @@
 #!/bin/sh
 set -eu
 
-version_jdk21=21.0.3+6  # https://github.com/openjdk/jdk21u/tags
+version_jdk21=21.0.3+7  # https://github.com/openjdk/jdk21u/tags
 version_jdk20=20.0.2+9  # https://github.com/openjdk/jdk20u/tags
 version_jdk19=19.0.2+7  # https://github.com/openjdk/jdk19u/tags
 version_jdk18=18.0.2.1+1  # https://github.com/openjdk/jdk18u/tags
-version_jdk17=17.0.11+6  # https://github.com/openjdk/jdk17u/tags
+version_jdk17=17.0.11+7  # https://github.com/openjdk/jdk17u/tags
 version_jdk16=16.0.2+7  # https://github.com/openjdk/jdk16u/tags
 version_jdk15=15.0.10+5  # https://github.com/openjdk/jdk15u/tags
 version_jdk14=14.0.2+12  # https://github.com/openjdk/jdk14u/tags
 version_jdk13=13.0.14+5  # https://github.com/openjdk/jdk13u/tags
 version_jdk12=12.0.2+10  # https://github.com/openjdk/jdk12u/tags
-version_jdk11=11.0.23+6  # https://github.com/openjdk/jdk11u/tags
+version_jdk11=11.0.23+7  # https://github.com/openjdk/jdk11u/tags
 version_jdk10=10.0.2+13  # https://github.com/openjdk/jdk10u/tags
 version_jdk9=9+181  # https://github.com/openjdk/jdk9u/tags
 version_make42=4.2.1  # https://ftp.gnu.org/gnu/make/
diff --git a/java/download.sha256 b/java/download.sha256
index a55c45c..ec84b6d 100644
--- a/java/download.sha256
+++ b/java/download.sha256
@@ -13,16 +13,16 @@ fd93e65a4692593c2100963be2c75d697a32ba51ee2c02c7e7dccc524dfb1788  icedtea-2.6.28
 600beb80f1c5a6dc6c6a8ed88a068a2c6d3777e225f6c97fcb812b9a35094940  icedtea-3.30.0.tar.xz
 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0  javac.in
 39ce1238d5b2066ffe1c1a09d87c170766309fe18290f27a4ab7d15844d34dc1  jdk10u-jdk-10.0.2+13.tar.gz
-c25a966a1159d060c5d589cf876b2776daecf3d71099e43707941d92a155b7eb  jdk11u-jdk-11.0.23+6.tar.gz
+9ade22c88d6ffbc6cf3f6b5e4454d5b7c6d55394e7cf02d4721aa297a05ea42a  jdk11u-jdk-11.0.23+7.tar.gz
 8494fa3a6ffef590c86b403379422f325101bc86607557cb27c6774d59710b84  jdk12u-jdk-12.0.2+10.tar.gz
 4c8e88490ed30276ea0145d37f33e094fcf436ce528bab29f6a9a3546820faf4  jdk13u-jdk-13.0.14+5.tar.gz
 582e3d805ab74582332250f95f9845608c8f3d3273aa92af6f683c45d1a4f8e8  jdk14u-jdk-14.0.2+12.tar.gz
 7aaeab4a68471e630d91eaf5540d067c8ffd5f023031be082b889763c1f94f3a  jdk15u-jdk-15.0.10+5.tar.gz
 b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c  jdk16u-jdk-16.0.2+7.tar.gz
-c57e2ad86125b93b38794742471d71d13699cd8348c0eca4cebf17789c27807c  jdk17u-jdk-17.0.11+6.tar.gz
+e73bbbee3da62fc7e7c1f462dbd187dcbafc140c4162e3ff35b1f6aca078267e  jdk17u-jdk-17.0.11+7.tar.gz
 7d026848a48e8777d3242bab2adf30122f0acda88abbd3f92636f8793eaf3455  jdk18u-jdk-18.0.2.1+1.tar.gz
 5903efd527dd08e9c235c8822e3d5699c3d18a8618c3e533307e8d6491ffbbf0  jdk19u-jdk-19.0.2+7.tar.gz
 4d6f176075d5f2ce62fd16ebd5cc4c27a3e551ce4d3d3bc0e9946454e52fc88d  jdk20u-jdk-20.0.2+9.tar.gz
-75a6ca52299ee2f5b028a5a4acedd6139ae740cbf1af034e2d50489e74598dd3  jdk21u-jdk-21.0.3+6.tar.gz
+e55632c74a236ee26efad20a9fc392d5272f5d7adf4c0905b9775d69b1e8e0ea  jdk21u-jdk-21.0.3+7.tar.gz
 a80c59433d394b241ebcd36968ec6ff017fab3fdf3700a459a5b59e978dab396  jdk9u-jdk-9+181.tar.gz
 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589  make-4.2.1.tar.bz2
diff --git a/java/install_gentoo.txt b/java/install_gentoo.txt
index ee0c4f4..55b7202 100644
--- a/java/install_gentoo.txt
+++ b/java/install_gentoo.txt
@@ -1,5 +1,3 @@
-sudo emerge -1 dev-java/java-config
-
 # NOTE: All of these commands rely on a same-version sdk not previously being installed
 
 sudo rsync -rvP build/install-icedtea8/ /opt/icedtea8
@@ -12,27 +10,27 @@ PROVIDES_TYPE='JDK JRE'
 PROVIDES_VERSION=1.8
 GENERATION=2
 EOF
-sudo emerge --buildpkg=n -O1 dev-java/openjdk:8
-sudo rm -rf /opt/icedtea8 /usr/share/java-config-2/vm/openjdk-bin-8
+sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-8
+echo 8 | sudo tee /var/db/pkg/dev-java/openjdk-bin-8/SLOT > /dev/null
 sudo emerge dev-java/openjdk:8
+sudo rm -rf /opt/icedtea8 /usr/share/java-config-2/vm/openjdk-bin-8 /var/db/pkg/dev-java/openjdk-bin-8
 
 sudo rsync -rvP build/install-jdk11/ /opt/jdk11
-sudo JAVA_HOME="$(echo /opt/jdk11/jvm/*/)" emerge --buildpkg=n -O1 dev-java/openjdk:11
-sudo rm -rf /opt/jdk11
-sudo emerge dev-java/openjdk:11
+sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-11
+echo 11 | sudo tee /var/db/pkg/dev-java/openjdk-bin-11/SLOT > /dev/null
+sudo JAVA_HOME="$(echo /opt/jdk11/jvm/*/)" emerge dev-java/openjdk:11
+sudo rm -rf /opt/jdk11 /var/db/pkg/dev-java/openjdk-bin-11
 
 sudo rsync -rvP build/install-jdk17/ /opt/jdk17
 sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-17
 echo 17 | sudo tee /var/db/pkg/dev-java/openjdk-bin-17/SLOT > /dev/null
 sudo ln -s /opt/jdk17/jvm/*/ /opt/openjdk-bin-17
-sudo emerge --buildpkg=n -O1 dev-java/openjdk:17
-sudo rm -rf /opt/jdk17 /opt/openjdk-bin-17 /var/db/pkg/dev-java/openjdk-bin-17
 sudo emerge dev-java/openjdk:17
+sudo rm -rf /opt/jdk17 /opt/openjdk-bin-17 /var/db/pkg/dev-java/openjdk-bin-17
 
 sudo rsync -rvP build/install-jdk21/ /opt/jdk21
 sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-21
 echo 21 | sudo tee /var/db/pkg/dev-java/openjdk-bin-21/SLOT > /dev/null
 sudo ln -s /opt/jdk21/jvm/*/ /opt/openjdk-bin-21
-sudo emerge --buildpkg=n -O1 dev-java/openjdk:21
-sudo rm -rf /opt/jdk21 /opt/openjdk-bin-21 /var/db/pkg/dev-java/openjdk-bin-21
 sudo emerge dev-java/openjdk:21
+sudo rm -rf /opt/jdk21 /opt/openjdk-bin-21 /var/db/pkg/dev-java/openjdk-bin-21