diff --git a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
index 4328838ba9..78aef56ea3 100644
--- a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true
-Bundle-Version: 3.23.400.qualifier
+Bundle-Version: 3.23.500.qualifier
 Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DetectVMInstallationsJob.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DetectVMInstallationsJob.java
index 4ffe57bfbf..92dc3fffcd 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DetectVMInstallationsJob.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DetectVMInstallationsJob.java
@@ -156,7 +156,7 @@ private Collection<File> computeCandidateVMs(StandardVMType standardType) {
 			.map(dir -> dir.listFiles(File::isDirectory))
 			.flatMap(Arrays::stream)
 			.filter(Objects::nonNull)
-			.collect(Collectors.toSet());
+				.collect(Collectors.toCollection(HashSet::new));
 
 		// particular VM installations
 		String javaHome = System.getenv("JAVA_HOME"); //$NON-NLS-1$
@@ -167,6 +167,11 @@ private Collection<File> computeCandidateVMs(StandardVMType standardType) {
 		if (jdkHome != null) {
 			directories.add(new File(jdkHome));
 		}
+		System.getenv().entrySet().forEach(entry -> {
+			if (entry.getKey().startsWith("JAVA_HOME_")) { //$NON-NLS-1$
+				directories.add(new File(entry.getValue()));
+			}
+		});
 		// other common/standard lookup strategies can be added here
 		return directories.stream()
 			.filter(Objects::nonNull)
diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml
index 436996f6db..83f98ceb78 100644
--- a/org.eclipse.jdt.launching/pom.xml
+++ b/org.eclipse.jdt.launching/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.launching</artifactId>
-  <version>3.23.400-SNAPSHOT</version>
+  <version>3.23.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <build>