diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index 3e5195322..ffc57f735 100644
--- a/images/linux/scripts/installers/java-tools.sh
+++ b/images/linux/scripts/installers/java-tools.sh
@@ -10,8 +10,6 @@ source $HELPER_SCRIPTS/os.sh
 
 set -e
 
-DEFAULT_JDK_VERSION=8
-
 # Install the Azul Systems Zulu JDKs
 # See https://www.azul.com/downloads/azure-only/zulu/
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9
@@ -21,6 +19,13 @@ apt-get -q update
 if isUbuntu16 || isUbuntu18 ; then
     apt-get -y install zulu-7-azure-jdk=\*
     echo "JAVA_HOME_7_X64=/usr/lib/jvm/zulu-7-azure-amd64" | tee -a /etc/environment
+    DEFAULT_JDK_VERSION=8
+    defaultLabel8="(default)"
+fi
+
+if isUbuntu20 ; then
+    DEFAULT_JDK_VERSION=11
+    defaultLabel11="(default)"
 fi
 
 apt-get -y install zulu-8-azure-jdk=\*
@@ -78,8 +83,8 @@ DocumentInstalledItem "Azul Zulu OpenJDK:"
 if isUbuntu16 || isUbuntu18 ; then
 DocumentInstalledItemIndent "7 ($(/usr/lib/jvm/zulu-7-azure-amd64/bin/java -showversion |& head -n 1))"
 fi
-DocumentInstalledItemIndent "8 ($(/usr/lib/jvm/zulu-8-azure-amd64/bin/java -showversion |& head -n 1)) (default)"
-DocumentInstalledItemIndent "11 ($(/usr/lib/jvm/zulu-11-azure-amd64/bin/java -showversion |& head -n 1))"
+DocumentInstalledItemIndent "8 ($(/usr/lib/jvm/zulu-8-azure-amd64/bin/java -showversion |& head -n 1)) $defaultLabel8"
+DocumentInstalledItemIndent "11 ($(/usr/lib/jvm/zulu-11-azure-amd64/bin/java -showversion |& head -n 1)) $defaultLabel11"
 DocumentInstalledItemIndent "12 ($(/usr/lib/jvm/zulu-12-azure-amd64/bin/java -showversion |& head -n 1))"
 DocumentInstalledItem "Ant ($(ant -version))"
 DocumentInstalledItem "Gradle ${gradleVersion}"