diff --git a/make.ps1 b/make.ps1
index a4f52761fd..50eabfb3ec 100644
--- a/make.ps1
+++ b/make.ps1
@@ -220,7 +220,7 @@ if([String]::IsNullOrWhiteSpace($env:WAR_URL)) {
     $env:WAR_URL = 'https://get.jenkins.io/{0}/{1}/jenkins.war' -f $releaseLine, $JenkinsVersion
 }
 
-$dockerComposeFile = 'build-windows_{0}.yaml' -f $ImageType
+$dockerComposeFile = 'build-windows_{0}_{1}.yaml' -f $ImageType, $JenkinsVersion
 $baseDockerCmd = 'docker-compose --file={0}' -f $dockerComposeFile
 $baseDockerBuildCmd = '{0} build --pull' -f $baseDockerCmd
 
diff --git a/tests/test_helpers.psm1 b/tests/test_helpers.psm1
index 86197e5b47..c98cad99dd 100644
--- a/tests/test_helpers.psm1
+++ b/tests/test_helpers.psm1
@@ -106,11 +106,10 @@ function Run-Program($cmd, $params, $verbose=$false) {
 }
 
 function Build-Docker($tag) {
-    $windowsVersion = '2019'
-    if ($tag -match 'ltsc(\d+)$') {
-        $windowsVersion = $matches[1]
-    }
-    $composeParams = '--file=build-windows_windowsservercore-ltsc{0}.yaml build --parallel' -f $windowsVersion
+    # Ex of tag: pester-jenkins-2.550-jdk21-hotspot-windowsservercore-ltsc2022
+    $windowsVersion = $tag.replace('pester-jenkins-', '').split('-')[4]
+    $jenkinsVersion = $tag.replace('pester-jenkins-', '').split('-')[0]
+    $composeParams = '--file=build-windows_windowsservercore-{0}_{1}.yaml build --parallel' -f $windowsVersion, $jenkinsVersion
     $exitCode, $stdout, $stderr = Run-Program 'docker-compose' $composeParams
     if($exitCode -ne 0) {
         return $exitCode, $stdout, $stderr