diff --git a/images/win/scripts/Tests/Java.Tests.ps1 b/images/win/scripts/Tests/Java.Tests.ps1
index 62a851d0..85c40a8b 100644
--- a/images/win/scripts/Tests/Java.Tests.ps1
+++ b/images/win/scripts/Tests/Java.Tests.ps1
@@ -36,18 +36,20 @@ Describe "Java" {
         if ($Version -eq 8) {
             $Version = "1.${Version}"
         }
-        $result.Output[0] | Should -Match ([regex]::Escape("openjdk version `"${Version}."))
+        $outputPattern = "openjdk version `"${Version}"
+        $result.Output[0] | Should -Match $outputPattern
     }
 
     It "Java Adopt Jdk <Version>" -TestCases $adoptJdkVersions {
         $adoptPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\bin\java"
-    
+
         $result = Get-CommandResult "`"$adoptPath`" -version"
         $result.ExitCode | Should -Be 0
-    
+
         if ($Version -eq 8) {
             $Version = "1.${Version}"
         }
-        $result.Output[0] | Should -Match ([regex]::Escape("openjdk version `"${Version}."))
+        $outputPattern = "openjdk version `"${Version}"
+        $result.Output[0] | Should -Match $outputPattern
     }
 }
diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json
index e1f58c02..40d8b2d3 100644
--- a/images/win/toolsets/toolset-2016.json
+++ b/images/win/toolsets/toolset-2016.json
@@ -146,7 +146,7 @@
         "vendors": [
             {
                 "name": "Temurin-Hotspot",
-                "versions": [ "8", "11" ]
+                "versions": [ "8", "11", "17" ]
             },
             {
                 "name": "Adopt",
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index 41539144..4383cfc7 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -146,7 +146,7 @@
         "vendors": [
             {
                 "name": "Temurin-Hotspot",
-                "versions": [ "8", "11" ]
+                "versions": [ "8", "11", "17" ]
             },
             {
                 "name": "Adopt",
diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
index ecf23ab2..de88621f 100644
--- a/images/win/toolsets/toolset-2022.json
+++ b/images/win/toolsets/toolset-2022.json
@@ -110,7 +110,7 @@
         "vendors": [
             {
                 "name": "Temurin-Hotspot",
-                "versions": [ "8", "11" ]
+                "versions": [ "8", "11", "17" ]
             },
             {
                 "name": "Adopt",