diff --git a/pipelines/jobs/configurations/jdk11u.groovy b/pipelines/jobs/configurations/jdk11u.groovy
index 311ab63ff..81814f228 100644
--- a/pipelines/jobs/configurations/jdk11u.groovy
+++ b/pipelines/jobs/configurations/jdk11u.groovy
@@ -1,14 +1,15 @@
 targetConfigurations = [
-        'x64Mac'        : [    'temurin',    'openj9'                    ],
-        'x64Linux'      : [    'temurin',    'hotspot',    'dragonwell',    'corretto',    'bisheng',    'fast_startup'],
-        'x64AlpineLinux': [    'temurin'                            ],
-        'x64Windows'    : [    'temurin',    'openj9',    'dragonwell'            ],
-        'ppc64Aix'      : [    'temurin',    'hotspot'                   ],
-        'ppc64leLinux'  : [    'temurin',    'openj9'                    ],
-        's390xLinux'    : [    'temurin',    'hotspot'                   ],
-        'aarch64Linux'  : [    'temurin',    'openj9',    'dragonwell',                   'bisheng'    ],
-        'aarch64Mac'    : [    'temurin',                           ],
-        'arm32Linux'    : [    'temurin'                            ]
+        'x64Mac'        : [ 'temurin', 'hotspot' ],
+        'x64Linux'      : [ 'temurin', 'hotspot',    'dragonwell',    'corretto',    'bisheng',    'fast_startup'],
+        'x64AlpineLinux': [ 'temurin', 'hotspot' ],
+        'x64Windows'    : [ 'temurin', 'hotspot' ],
+        'x32Windows'    : [            'hotspot' ],
+        'ppc64Aix'      : [ 'temurin', 'hotspot' ],
+        'ppc64leLinux'  : [ 'temurin', 'hotspot' ],
+        's390xLinux'    : [ 'temurin', 'hotspot' ],
+        'aarch64Linux'  : [ 'temurin', 'hotspot' ],
+        'aarch64Mac'    : [ 'temurin', 'hotspot' ],
+        'arm32Linux'    : [ 'temurin', 'hotspot' ]
 ]
 
 // scmReferences to use for weekly release build
diff --git a/pipelines/jobs/configurations/jdk17u.groovy b/pipelines/jobs/configurations/jdk17u.groovy
index 7d4b68607..796c5e65d 100644
--- a/pipelines/jobs/configurations/jdk17u.groovy
+++ b/pipelines/jobs/configurations/jdk17u.groovy
@@ -1,18 +1,22 @@
 targetConfigurations = [
         'x64Mac'      : [
                 'temurin',
-                'openj9'
+                'hotspot'
         ],
         'x64Linux'    : [
                 'temurin',
                 'hotspot'
         ],
         'x64AlpineLinux' : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'x64Windows'  : [
                 'temurin',
-                'openj9'
+                'hotspot'
+        ],
+        'x32Windows'  : [
+                'hotspot'
         ],
         'ppc64Aix'    : [
                 'temurin',
@@ -20,7 +24,7 @@ targetConfigurations = [
         ],
         'ppc64leLinux': [
                 'temurin',
-                'openj9'
+                'hotspot'
         ],
         's390xLinux'  : [
                 'temurin',
@@ -28,17 +32,19 @@ targetConfigurations = [
         ],
         'aarch64Linux': [
                 'temurin',
-                'openj9',
-                'bisheng'
+                'hotspot'
         ],
         'aarch64Mac': [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'arm32Linux'  : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'riscv64Linux': [
-                'temurin'
+                'temurin',
+                'hotspot'
         ]
 ]
 
diff --git a/pipelines/jobs/configurations/jdk21u.groovy b/pipelines/jobs/configurations/jdk21u.groovy
index 9b9343d88..e23288743 100644
--- a/pipelines/jobs/configurations/jdk21u.groovy
+++ b/pipelines/jobs/configurations/jdk21u.groovy
@@ -1,43 +1,51 @@
 targetConfigurations = [
         'x64Mac'      : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'x64Linux'    : [
                 'temurin',
                 'hotspot'
         ],
         'x64AlpineLinux' : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'aarch64AlpineLinux' : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'x64Windows'  : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'aarch64Windows' : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'ppc64Aix'    : [
                 'temurin',
                 'hotspot'
         ],
         'ppc64leLinux': [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         's390xLinux'  : [
                 'temurin',
                 'hotspot'
         ],
         'aarch64Linux': [
-                'hotspot',
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'aarch64Mac': [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'riscv64Linux': [
-                'temurin'
+                'temurin',
+                'hotspot'
         ]
 ]
 
diff --git a/pipelines/jobs/configurations/jdk25u.groovy b/pipelines/jobs/configurations/jdk25u.groovy
index 78b2b6d31..5bf361c3c 100644
--- a/pipelines/jobs/configurations/jdk25u.groovy
+++ b/pipelines/jobs/configurations/jdk25u.groovy
@@ -1,29 +1,35 @@
 targetConfigurations = [
         'x64Mac'      : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'x64Linux'    : [
                 'temurin',
                 'hotspot'
         ],
         'x64AlpineLinux' : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'aarch64AlpineLinux' : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'x64Windows'  : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'aarch64Windows' : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         'ppc64Aix'    : [
                 'temurin',
                 'hotspot'
         ],
         'ppc64leLinux': [
-                'temurin'
+                'temurin',
+                'hotspot'
         ],
         's390xLinux'  : [
                 'temurin',
@@ -34,10 +40,15 @@ targetConfigurations = [
                 'temurin'
         ],
         'aarch64Mac': [
-                'temurin'
+                'temurin',
+                'hotspot'
+        ],
+        'arm32Linux'  : [
+                'hotspot'
         ],
         'riscv64Linux': [
-                'temurin'
+                'temurin',
+                'hotspot'
         ]
 ]
 
diff --git a/pipelines/jobs/configurations/jdk26.groovy b/pipelines/jobs/configurations/jdk26.groovy
index 77256624b..d8d0707c6 100644
--- a/pipelines/jobs/configurations/jdk26.groovy
+++ b/pipelines/jobs/configurations/jdk26.groovy
@@ -33,6 +33,9 @@ targetConfigurations = [
         'aarch64Mac': [
                 'temurin'
         ],
+        'arm32Linux'  : [
+                'hotspot'
+        ],
         'riscv64Linux': [
                 'temurin'
         ]
diff --git a/pipelines/jobs/configurations/jdk8u.groovy b/pipelines/jobs/configurations/jdk8u.groovy
index 6be00ba72..144be5303 100644
--- a/pipelines/jobs/configurations/jdk8u.groovy
+++ b/pipelines/jobs/configurations/jdk8u.groovy
@@ -13,10 +13,12 @@ targetConfigurations = [
         'x64AlpineLinux' : [
                 'temurin'
         ],
+        'x32Windows'    : [
+                'hotspot'
+        ],
         'x64Windows'    : [
                 'temurin',
-                'openj9',
-                'dragonwell'
+                'hotspot'
         ],
         'ppc64Aix'      : [
                 'temurin',
@@ -24,19 +26,18 @@ targetConfigurations = [
         ],
         'ppc64leLinux'  : [
                 'temurin',
-                'openj9'
+                'hotspot'
         ],
         's390xLinux'    : [
                 'openj9'
         ],
         'aarch64Linux'  : [
                 'temurin',
-                'openj9',
-                'dragonwell',
-                'bisheng'
+                'hotspot'
         ],
         'arm32Linux'  : [
-                'temurin'
+                'temurin',
+                'hotspot'
         ]
 ]