diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 8c4bd46a35..c2ccd14f18 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6660,7 +6660,10 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
 			else
 
-				local packages='ca-certificates-java openjdk-8-jre-headless openjdk-8-jdk-headless'
+				local version=8
+				(( $G_DISTRO == 5 )) && version=11
+
+				local packages="ca-certificates-java openjdk-$version-jre-headless openjdk-$version-jdk-headless"
 				# Workaround for ARM install issue: https://github.com/MichaIng/DietPi/issues/2524
 				apt-get install -y -qq $packages
 				G_AGI $packages