diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
index 6142fea12..b145b8fbd 100644
--- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -45,10 +45,11 @@ class Config17 {
                 ]
         ],
 
+        // Bumped to win2019 and vs2019 to support ZGC
         x64Windows: [
                 os                  : 'windows',
                 arch                : 'x64',
-                additionalNodeLabels: 'win2012&&vs2017',
+                additionalNodeLabels: 'win2019&&vs2019',
                 test                : 'default',
                 buildArgs           : [
                         "temurin"   : '--create-jre-image'
diff --git a/pipelines/jobs/configurations/jdk18_pipeline_config.groovy b/pipelines/jobs/configurations/jdk18_pipeline_config.groovy
index fd65fed26..e140b110a 100644
--- a/pipelines/jobs/configurations/jdk18_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk18_pipeline_config.groovy
@@ -36,10 +36,11 @@ class Config18 {
                 configureArgs       : '--enable-headless-only=yes'
         ],
 
+        // Bumped to win2019 and vs2019 to support ZGC
         x64Windows: [
                 os                  : 'windows',
                 arch                : 'x64',
-                additionalNodeLabels: 'win2012&&vs2017',
+                additionalNodeLabels: 'win2019&&vs2019',
                 test                : 'default'
         ],
 
@@ -56,7 +57,6 @@ class Config18 {
                 ]
         ],
 
-
         x32Windows: [
                 os                  : 'windows',
                 arch                : 'x86-32',
@@ -78,7 +78,6 @@ class Config18 {
                 cleanWorkspaceAfterBuild: true
         ],
 
-
         s390xLinux    : [
                 os                  : 'linux',
                 arch                : 's390x',
diff --git a/pipelines/jobs/configurations/jdk19_pipeline_config.groovy b/pipelines/jobs/configurations/jdk19_pipeline_config.groovy
index 369c38582..e6064eccc 100644
--- a/pipelines/jobs/configurations/jdk19_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk19_pipeline_config.groovy
@@ -36,10 +36,11 @@ class Config19 {
                 configureArgs       : '--enable-headless-only=yes'
         ],
 
+        // Bumped to win2019 and vs2019 to support ZGC
         x64Windows: [
                 os                  : 'windows',
                 arch                : 'x64',
-                additionalNodeLabels: 'win2012&&vs2017',
+                additionalNodeLabels: 'win2019&&vs2019',
                 test                : 'default'
         ],
 
@@ -56,7 +57,6 @@ class Config19 {
                 ]
         ],
 
-
         x32Windows: [
                 os                  : 'windows',
                 arch                : 'x86-32',
@@ -78,7 +78,6 @@ class Config19 {
                 cleanWorkspaceAfterBuild: true
         ],
 
-
         s390xLinux    : [
                 os                  : 'linux',
                 arch                : 's390x',
@@ -120,6 +119,7 @@ class Config19 {
                 test                : 'default',
                 configureArgs       : '--enable-dtrace'
         ],
+
         riscv64Linux      :  [
                 os                   : 'linux',
                 arch                 : 'riscv64',