diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1
index 4e54661ab..ed094d65f 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Java.psm1
@@ -18,12 +18,11 @@ function Get-JavaVersions {
     return $javaVersions | Sort-Object $sortRules | ForEach-Object {
         $javaPath = $_.Value
         $version = Get-JavaFullVersion $javaPath
-        $vendor = $version.StartsWith("1.7") ? "Zulu" : "AdoptOpenJDK"
         $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : ""
 
         [PSCustomObject] @{
             "Version" = $version + $defaultPostfix
-            "Vendor" = $vendor
+            "Vendor" = "AdoptOpenJDK"
             "Environment Variable" = $_.Name
         }
     }
diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index 1aa1e42ce..5a8933daa 100644
--- a/images/linux/scripts/installers/java-tools.sh
+++ b/images/linux/scripts/installers/java-tools.sh
@@ -22,13 +22,8 @@ fi
 apt-get update
 
 for JAVA_VERSION in ${JAVA_VERSIONS_LIST[@]}; do
-    if [[ $JAVA_VERSION == "7" ]]; 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
-    else
-        apt-get -y install adoptopenjdk-$JAVA_VERSION-hotspot=\*
-        echo "JAVA_HOME_${JAVA_VERSION}_X64=/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" | tee -a /etc/environment
-    fi
+    apt-get -y install adoptopenjdk-$JAVA_VERSION-hotspot=\*
+    echo "JAVA_HOME_${JAVA_VERSION}_X64=/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" | tee -a /etc/environment
 done
 
 # Set Default Java version.
diff --git a/images/linux/scripts/tests/Java.Tests.ps1 b/images/linux/scripts/tests/Java.Tests.ps1
index 29c1a9712..177fafd15 100644
--- a/images/linux/scripts/tests/Java.Tests.ps1
+++ b/images/linux/scripts/tests/Java.Tests.ps1
@@ -31,7 +31,7 @@ Describe "Java" {
         $result = Get-CommandResult "`"$javaPath`" -version"
         $result.ExitCode | Should -Be 0
 
-        if ($Version -eq 7 -or $Version -eq 8) {
+        if ($Version -eq 8) {
             $Version = "1.${Version}"
         }
         $result.Output | Should -Match ([regex]::Escape("openjdk version `"${Version}."))
diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json
index a01eb64f1..39e3949a6 100644
--- a/images/linux/toolsets/toolset-1604.json
+++ b/images/linux/toolsets/toolset-1604.json
@@ -81,7 +81,7 @@
     "java": {
         "default": "8",
         "versions": [
-            "7", "8", "11", "12"
+            "8", "11", "12"
         ]
     },
     "android": {
diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index 278a5146f..bc8cbe30f 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -81,7 +81,7 @@
     "java": {
         "default": "8",
         "versions": [
-            "7", "8", "11", "12"
+            "8", "11", "12"
         ]
     },
     "android": {