diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
index 9c1b06b6d..2e7e13605 100644
--- a/pipelines/build/common/openjdk_build_pipeline.groovy
+++ b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -381,8 +381,8 @@ class Build {
                     context.stage("${testType}") {
                         def isFipsTestBuild = false
                         def rerunIterations = '3'
-                        if ("${testType}".contains(".fips")) {
-                            testType = testType.replace(".fips","")
+                        if ("${testType}".contains(".fips140_2")) {
+                            testType = testType.replace(".fips140_2","")
                             isFipsTestBuild = true
                             rerunIterations = '0'
                         }
@@ -448,8 +448,8 @@ class Build {
 
                         def testFlag = ''
                         if (isFipsTestBuild) {
-                            jobParams.put('TEST_JOB_NAME', "${jobParams.TEST_JOB_NAME}_fips")
-                            testFlag = 'FIPS'
+                            jobParams.put('TEST_JOB_NAME', "${jobParams.TEST_JOB_NAME}_fips140_2")
+                            testFlag = 'FIPS140_2'
                         }
                         def parallel = 'None'
                         def numMachinesPerTest = ''
diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
index 1a0370443..a6702aa19 100644
--- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
@@ -294,17 +294,13 @@ class Config11 {
                         'special.functional',
                         'special.jck',
                         'sanity.external',
-                        'sanity.functional.fips',
-                        'extended.functional.fips',
-                        'special.functional.fips',
-                        'sanity.jck.fips',
-                        'extended.jck.fips',
-                        'special.jck.fips',
-                        'sanity.openjdk.fips',
-                        'extended.openjdk.fips',
-                        'sanity.system.fips',
-                        'extended.system.fips',
-                        'special.system.fips',
+                        'sanity.functional.fips140_2',
+                        'extended.functional.fips140_2',
+                        'sanity.jck.fips140_2',
+                        'extended.jck.fips140_2',
+                        'special.jck.fips140_2',
+                        'sanity.openjdk.fips140_2',
+                        'extended.openjdk.fips140_2',
                         'dev.jck'
                     ]
             ],
diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
index d3dc83929..06c66729d 100644
--- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -274,17 +274,13 @@ class Config17 {
                                 'special.functional',
                                 'special.jck',
                                 'sanity.external',
-                                'sanity.functional.fips',
-                                'extended.functional.fips',
-                                'special.functional.fips',
-                                'sanity.jck.fips',
-                                'extended.jck.fips',
-                                'special.jck.fips',
-                                'sanity.openjdk.fips',
-                                'extended.openjdk.fips',
-                                'sanity.system.fips',
-                                'extended.system.fips',
-                                'special.system.fips'
+                                'sanity.functional.fips140_2',
+                                'extended.functional.fips140_2',
+                                'sanity.jck.fips140_2',
+                                'extended.jck.fips140_2',
+                                'special.jck.fips140_2',
+                                'sanity.openjdk.fips140_2',
+                                'extended.openjdk.fips140_2'
                         ]
                 ],
                 additionalTestLabels: [
diff --git a/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
index e00fccfe1..3796a1b0c 100644
--- a/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
@@ -54,14 +54,13 @@ class Config19 {
                                 'special.functional',
                                 'special.jck',
                                 'sanity.external',
-                                'sanity.functional.fips',
-                                'extended.functional.fips',
-                                'special.functional.fips',
-                                'sanity.jck.fips',
-                                'extended.jck.fips',
-                                'special.jck.fips',
-                                'sanity.openjdk.fips',
-                                'extended.openjdk.fips'
+                                'sanity.functional.fips140_2',
+                                'extended.functional.fips140_2',
+                                'sanity.jck.fips140_2',
+                                'extended.jck.fips140_2',
+                                'special.jck.fips140_2',
+                                'sanity.openjdk.fips140_2',
+                                'extended.openjdk.fips140_2'
                         ]
                 ],
                 cleanWorkspaceAfterBuild: true,
diff --git a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
index d140dfca9..239bfed48 100644
--- a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
@@ -50,14 +50,13 @@ class Config20 {
                                 "special.functional",
                                 "special.jck",
                                 "sanity.external",
-                                "sanity.functional.fips",
-                                "extended.functional.fips",
-                                "special.functional.fips",
-                                "sanity.jck.fips",
-                                "extended.jck.fips",
-                                "special.jck.fips",
-                                "sanity.openjdk.fips",
-                                "extended.openjdk.fips"
+                                "sanity.functional.fips140_2",
+                                "extended.functional.fips140_2",
+                                "sanity.jck.fips140_2",
+                                "extended.jck.fips140_2",
+                                "special.jck.fips140_2",
+                                "sanity.openjdk.fips140_2",
+                                "extended.openjdk.fips140_2"
                         ]
                 ],
                 cleanWorkspaceAfterBuild: true,
diff --git a/pipelines/jobs/configurations/jdk21_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21_pipeline_config.groovy
index 99fb95240..c52f6a495 100644
--- a/pipelines/jobs/configurations/jdk21_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk21_pipeline_config.groovy
@@ -253,14 +253,13 @@ class Config21 {
                                 "special.functional",
                                 "special.jck",
                                 "sanity.external",
-                                "sanity.functional.fips",
-                                "extended.functional.fips",
-                                "special.functional.fips",
-                                "sanity.jck.fips",
-                                "extended.jck.fips",
-                                "special.jck.fips",
-                                "sanity.openjdk.fips",
-                                "extended.openjdk.fips"
+                                "sanity.functional.fips140_2",
+                                "extended.functional.fips140_2",
+                                "sanity.jck.fips140_2",
+                                "extended.jck.fips140_2",
+                                "special.jck.fips140_2",
+                                "sanity.openjdk.fips140_2",
+                                "extended.openjdk.fips140_2"
                         ]
                 ],
                 cleanWorkspaceAfterBuild: true,
diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
index eff1ebe27..d3d3282fe 100644
--- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
@@ -46,17 +46,13 @@ class Config8 {
                                 'special.functional',
                                 'special.jck',
                                 'sanity.external',
-                                'sanity.functional.fips',
-                                'extended.functional.fips',
-                                'special.functional.fips',
-                                'sanity.jck.fips',
-                                'extended.jck.fips',
-                                'special.jck.fips',
-                                'sanity.openjdk.fips',
-                                'extended.openjdk.fips',
-                                'sanity.system.fips',
-                                'extended.system.fips',
-                                'special.system.fips'
+                                'sanity.functional.fips140_2',
+                                'extended.functional.fips140_2',
+                                'sanity.jck.fips140_2',
+                                'extended.jck.fips140_2',
+                                'special.jck.fips140_2',
+                                'sanity.openjdk.fips140_2',
+                                'extended.openjdk.fips140_2'
                         ]
                 ],
                 configureArgs       : [