diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.21__periodics.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.21__periodics.yaml
index a2225fdb23c64..05be424b06c73 100644
--- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.21__periodics.yaml
+++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.21__periodics.yaml
@@ -53,12 +53,11 @@ resources:
       cpu: 100m
       memory: 200Mi
 tests:
-- as: e2e-aws-external-oidc-configure-techpreview
+- as: e2e-aws-external-oidc-configure
   interval: 24h
   steps:
     cluster_profile: aws-3
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
@@ -66,12 +65,11 @@ tests:
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-aws
   timeout: 5h0m0s
-- as: e2e-azure-external-oidc-configure-techpreview
+- as: e2e-azure-external-oidc-configure
   interval: 24h
   steps:
     cluster_profile: azure4
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
@@ -79,12 +77,11 @@ tests:
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-azure
   timeout: 5h0m0s
-- as: e2e-gcp-external-oidc-configure-techpreview
+- as: e2e-gcp-external-oidc-configure
   interval: 24h
   steps:
     cluster_profile: gcp
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
@@ -92,12 +89,11 @@ tests:
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-gcp
   timeout: 5h0m0s
-- as: e2e-vsphere-external-oidc-configure-techpreview
+- as: e2e-vsphere-external-oidc-configure
   interval: 24h
   steps:
     cluster_profile: vsphere-elastic
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
@@ -105,7 +101,7 @@ tests:
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-vsphere
   timeout: 5h0m0s
-- as: e2e-metal-ovn-ipv4-external-oidc-configure-techpreview
+- as: e2e-metal-ovn-ipv4-external-oidc-configure
   cluster: build05
   interval: 24h
   steps:
@@ -114,14 +110,13 @@ tests:
       DEVSCRIPTS_CONFIG: |
         IP_STACK=v4
         NETWORK_TYPE=OVNKubernetes
-        FEATURE_SET=TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
         reverting to IntegratedOAuth
       TEST_SUITE: openshift/auth/external-oidc
     workflow: baremetalds-e2e
   timeout: 5h0m0s
-- as: e2e-metal-ovn-ipv6-external-oidc-configure-techpreview
+- as: e2e-metal-ovn-ipv6-external-oidc-configure
   cluster: build05
   interval: 24h
   steps:
@@ -130,14 +125,13 @@ tests:
       DEVSCRIPTS_CONFIG: |
         IP_STACK=v6
         NETWORK_TYPE=OVNKubernetes
-        FEATURE_SET=TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
         reverting to IntegratedOAuth
       TEST_SUITE: openshift/auth/external-oidc
     workflow: baremetalds-e2e
   timeout: 5h0m0s
-- as: e2e-metal-ovn-dualstack-external-oidc-configure-techpreview
+- as: e2e-metal-ovn-dualstack-external-oidc-configure
   cluster: build05
   interval: 24h
   steps:
@@ -146,31 +140,28 @@ tests:
       DEVSCRIPTS_CONFIG: |
         IP_STACK=v4v6
         NETWORK_TYPE=OVNKubernetes
-        FEATURE_SET=TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
         reverting to IntegratedOAuth
       TEST_SUITE: openshift/auth/external-oidc
     workflow: baremetalds-e2e
   timeout: 5h0m0s
-- as: e2e-aws-sno-external-oidc-configure-techpreview
+- as: e2e-aws-sno-external-oidc-configure
   interval: 24h
   steps:
     cluster_profile: aws-3
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants,legacy-node-invariants,legacy-kube-apiserver-invariants,audit-log-analyzer
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
         reverting to IntegratedOAuth
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-aws-single-node
   timeout: 5h0m0s
-- as: e2e-aws-external-oidc-rollback-techpreview
+- as: e2e-aws-external-oidc-revertoauth
   interval: 24h
   steps:
     cluster_profile: aws-3
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
@@ -178,12 +169,11 @@ tests:
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-aws
   timeout: 5h0m0s
-- as: e2e-azure-external-oidc-rollback-techpreview
+- as: e2e-azure-external-oidc-revertoauth
   interval: 24h
   steps:
     cluster_profile: azure4
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
@@ -191,12 +181,11 @@ tests:
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-azure
   timeout: 5h0m0s
-- as: e2e-gcp-external-oidc-rollback-techpreview
+- as: e2e-gcp-external-oidc-revertoauth
   interval: 24h
   steps:
     cluster_profile: gcp
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
@@ -204,12 +193,11 @@ tests:
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-gcp
   timeout: 5h0m0s
-- as: e2e-vsphere-external-oidc-rollback-techpreview
+- as: e2e-vsphere-external-oidc-revertoauth
   interval: 24h
   steps:
     cluster_profile: vsphere-elastic
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
@@ -217,7 +205,7 @@ tests:
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-vsphere
   timeout: 5h0m0s
-- as: e2e-metal-ovn-ipv4-external-oidc-rollback-techpreview
+- as: e2e-metal-ovn-ipv4-external-oidc-revertoauth
   cluster: build05
   interval: 24h
   steps:
@@ -226,14 +214,13 @@ tests:
       DEVSCRIPTS_CONFIG: |
         IP_STACK=v4
         NETWORK_TYPE=OVNKubernetes
-        FEATURE_SET=TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
         external IdP is configured
       TEST_SUITE: openshift/auth/external-oidc
     workflow: baremetalds-e2e
   timeout: 5h0m0s
-- as: e2e-metal-ovn-ipv6-external-oidc-rollback-techpreview
+- as: e2e-metal-ovn-ipv6-external-oidc-revertoauth
   cluster: build05
   interval: 24h
   steps:
@@ -242,14 +229,13 @@ tests:
       DEVSCRIPTS_CONFIG: |
         IP_STACK=v6
         NETWORK_TYPE=OVNKubernetes
-        FEATURE_SET=TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
         external IdP is configured
       TEST_SUITE: openshift/auth/external-oidc
     workflow: baremetalds-e2e
   timeout: 5h0m0s
-- as: e2e-metal-ovn-dualstack-external-oidc-rollback-techpreview
+- as: e2e-metal-ovn-dualstack-external-oidc-revertoauth
   cluster: build05
   interval: 24h
   steps:
@@ -258,74 +244,68 @@ tests:
       DEVSCRIPTS_CONFIG: |
         IP_STACK=v4v6
         NETWORK_TYPE=OVNKubernetes
-        FEATURE_SET=TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
         external IdP is configured
       TEST_SUITE: openshift/auth/external-oidc
     workflow: baremetalds-e2e
   timeout: 5h0m0s
-- as: e2e-aws-external-oidc-uid-extra-techpreview
+- as: e2e-aws-external-oidc-uid-extra
   interval: 24h
   steps:
     cluster_profile: aws-3
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDC\]
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-aws
   timeout: 5h0m0s
-- as: e2e-aws-sno-external-oidc-rollback-techpreview
+- as: e2e-aws-sno-external-oidc-revertoauth
   interval: 24h
   steps:
     cluster_profile: aws-3
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants,legacy-node-invariants,legacy-kube-apiserver-invariants,audit-log-analyzer
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDCWithUIDAndExtraClaimMappings\]\|\[OCPFeatureGate:ExternalOIDC\]
         external IdP is configured
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-aws-single-node
   timeout: 5h0m0s
-- as: e2e-azure-external-oidc-uid-extra-techpreview
+- as: e2e-azure-external-oidc-uid-extra
   interval: 24h
   steps:
     cluster_profile: azure4
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDC\]
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-azure
   timeout: 5h0m0s
-- as: e2e-gcp-external-oidc-uid-extra-techpreview
+- as: e2e-gcp-external-oidc-uid-extra
   interval: 24h
   steps:
     cluster_profile: gcp
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDC\]
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-gcp
   timeout: 5h0m0s
-- as: e2e-vsphere-external-oidc-uid-extra-techpreview
+- as: e2e-vsphere-external-oidc-uid-extra
   interval: 24h
   steps:
     cluster_profile: vsphere-elastic
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDC\]
       TEST_SUITE: openshift/auth/external-oidc
     workflow: openshift-e2e-vsphere
   timeout: 5h0m0s
-- as: e2e-metal-ovn-ipv4-external-oidc-uid-extra-techpreview
+- as: e2e-metal-ovn-ipv4-external-oidc-uid-extra
   cluster: build05
   interval: 24h
   steps:
@@ -334,13 +314,12 @@ tests:
       DEVSCRIPTS_CONFIG: |
         IP_STACK=v4
         NETWORK_TYPE=OVNKubernetes
-        FEATURE_SET=TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDC\]
       TEST_SUITE: openshift/auth/external-oidc
     workflow: baremetalds-e2e
   timeout: 5h0m0s
-- as: e2e-metal-ovn-ipv6-external-oidc-uid-extra-techpreview
+- as: e2e-metal-ovn-ipv6-external-oidc-uid-extra
   cluster: build05
   interval: 24h
   steps:
@@ -349,13 +328,12 @@ tests:
       DEVSCRIPTS_CONFIG: |
         IP_STACK=v6
         NETWORK_TYPE=OVNKubernetes
-        FEATURE_SET=TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDC\]
       TEST_SUITE: openshift/auth/external-oidc
     workflow: baremetalds-e2e
   timeout: 5h0m0s
-- as: e2e-metal-ovn-dualstack-external-oidc-uid-extra-techpreview
+- as: e2e-metal-ovn-dualstack-external-oidc-uid-extra
   cluster: build05
   interval: 24h
   steps:
@@ -364,18 +342,16 @@ tests:
       DEVSCRIPTS_CONFIG: |
         IP_STACK=v4v6
         NETWORK_TYPE=OVNKubernetes
-        FEATURE_SET=TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDC\]
       TEST_SUITE: openshift/auth/external-oidc
     workflow: baremetalds-e2e
   timeout: 5h0m0s
-- as: e2e-aws-sno-external-oidc-uid-extra-techpreview
+- as: e2e-aws-sno-external-oidc-uid-extra
   interval: 24h
   steps:
     cluster_profile: aws-3
     env:
-      FEATURE_SET: TechPreviewNoUpgrade
       TEST_ARGS: --disable-monitor=legacy-cvo-invariants,legacy-test-framework-invariants,legacy-node-invariants,legacy-kube-apiserver-invariants,audit-log-analyzer
       TEST_SKIPS: \[OCPFeatureGate:ExternalOIDC\]
       TEST_SUITE: openshift/auth/external-oidc
diff --git a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.21-periodics.yaml b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.21-periodics.yaml
index dc29fc5b68eda..534290e741e07 100644
--- a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.21-periodics.yaml
+++ b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.21-periodics.yaml
@@ -16,7 +16,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-external-oidc-configure-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-external-oidc-configure
   spec:
     containers:
     - args:
@@ -25,7 +25,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-external-oidc-configure-techpreview
+      - --target=e2e-aws-external-oidc-configure
       - --variant=periodics
       command:
       - ci-operator
@@ -91,7 +91,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-external-oidc-rollback-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-external-oidc-revertoauth
   spec:
     containers:
     - args:
@@ -100,7 +100,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-external-oidc-rollback-techpreview
+      - --target=e2e-aws-external-oidc-revertoauth
       - --variant=periodics
       command:
       - ci-operator
@@ -166,7 +166,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-external-oidc-uid-extra-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-external-oidc-uid-extra
   spec:
     containers:
     - args:
@@ -175,7 +175,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-external-oidc-uid-extra-techpreview
+      - --target=e2e-aws-external-oidc-uid-extra
       - --variant=periodics
       command:
       - ci-operator
@@ -241,7 +241,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-sno-external-oidc-configure-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-sno-external-oidc-configure
   spec:
     containers:
     - args:
@@ -250,7 +250,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-sno-external-oidc-configure-techpreview
+      - --target=e2e-aws-sno-external-oidc-configure
       - --variant=periodics
       command:
       - ci-operator
@@ -316,7 +316,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-sno-external-oidc-rollback-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-sno-external-oidc-revertoauth
   spec:
     containers:
     - args:
@@ -325,7 +325,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-sno-external-oidc-rollback-techpreview
+      - --target=e2e-aws-sno-external-oidc-revertoauth
       - --variant=periodics
       command:
       - ci-operator
@@ -391,7 +391,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-sno-external-oidc-uid-extra-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-aws-sno-external-oidc-uid-extra
   spec:
     containers:
     - args:
@@ -400,7 +400,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-aws-sno-external-oidc-uid-extra-techpreview
+      - --target=e2e-aws-sno-external-oidc-uid-extra
       - --variant=periodics
       command:
       - ci-operator
@@ -466,7 +466,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-azure-external-oidc-configure-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-azure-external-oidc-configure
   spec:
     containers:
     - args:
@@ -475,7 +475,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-external-oidc-configure-techpreview
+      - --target=e2e-azure-external-oidc-configure
       - --variant=periodics
       command:
       - ci-operator
@@ -541,7 +541,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-azure-external-oidc-rollback-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-azure-external-oidc-revertoauth
   spec:
     containers:
     - args:
@@ -550,7 +550,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-external-oidc-rollback-techpreview
+      - --target=e2e-azure-external-oidc-revertoauth
       - --variant=periodics
       command:
       - ci-operator
@@ -616,7 +616,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-azure-external-oidc-uid-extra-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-azure-external-oidc-uid-extra
   spec:
     containers:
     - args:
@@ -625,7 +625,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-azure-external-oidc-uid-extra-techpreview
+      - --target=e2e-azure-external-oidc-uid-extra
       - --variant=periodics
       command:
       - ci-operator
@@ -691,7 +691,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-gcp-external-oidc-configure-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-gcp-external-oidc-configure
   spec:
     containers:
     - args:
@@ -700,7 +700,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-external-oidc-configure-techpreview
+      - --target=e2e-gcp-external-oidc-configure
       - --variant=periodics
       command:
       - ci-operator
@@ -766,7 +766,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-gcp-external-oidc-rollback-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-gcp-external-oidc-revertoauth
   spec:
     containers:
     - args:
@@ -775,7 +775,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-external-oidc-rollback-techpreview
+      - --target=e2e-gcp-external-oidc-revertoauth
       - --variant=periodics
       command:
       - ci-operator
@@ -841,7 +841,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-gcp-external-oidc-uid-extra-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-gcp-external-oidc-uid-extra
   spec:
     containers:
     - args:
@@ -850,7 +850,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-gcp-external-oidc-uid-extra-techpreview
+      - --target=e2e-gcp-external-oidc-uid-extra
       - --variant=periodics
       command:
       - ci-operator
@@ -917,7 +917,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-dualstack-external-oidc-configure-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-dualstack-external-oidc-configure
   spec:
     containers:
     - args:
@@ -926,7 +926,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-metal-ovn-dualstack-external-oidc-configure-techpreview
+      - --target=e2e-metal-ovn-dualstack-external-oidc-configure
       - --variant=periodics
       command:
       - ci-operator
@@ -993,7 +993,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-dualstack-external-oidc-rollback-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-dualstack-external-oidc-revertoauth
   spec:
     containers:
     - args:
@@ -1002,7 +1002,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-metal-ovn-dualstack-external-oidc-rollback-techpreview
+      - --target=e2e-metal-ovn-dualstack-external-oidc-revertoauth
       - --variant=periodics
       command:
       - ci-operator
@@ -1069,7 +1069,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-dualstack-external-oidc-uid-extra-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-dualstack-external-oidc-uid-extra
   spec:
     containers:
     - args:
@@ -1078,7 +1078,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-metal-ovn-dualstack-external-oidc-uid-extra-techpreview
+      - --target=e2e-metal-ovn-dualstack-external-oidc-uid-extra
       - --variant=periodics
       command:
       - ci-operator
@@ -1145,7 +1145,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv4-external-oidc-configure-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv4-external-oidc-configure
   spec:
     containers:
     - args:
@@ -1154,7 +1154,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-metal-ovn-ipv4-external-oidc-configure-techpreview
+      - --target=e2e-metal-ovn-ipv4-external-oidc-configure
       - --variant=periodics
       command:
       - ci-operator
@@ -1221,7 +1221,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv4-external-oidc-rollback-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv4-external-oidc-revertoauth
   spec:
     containers:
     - args:
@@ -1230,7 +1230,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-metal-ovn-ipv4-external-oidc-rollback-techpreview
+      - --target=e2e-metal-ovn-ipv4-external-oidc-revertoauth
       - --variant=periodics
       command:
       - ci-operator
@@ -1297,7 +1297,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv4-external-oidc-uid-extra-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv4-external-oidc-uid-extra
   spec:
     containers:
     - args:
@@ -1306,7 +1306,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-metal-ovn-ipv4-external-oidc-uid-extra-techpreview
+      - --target=e2e-metal-ovn-ipv4-external-oidc-uid-extra
       - --variant=periodics
       command:
       - ci-operator
@@ -1373,7 +1373,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv6-external-oidc-configure-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv6-external-oidc-configure
   spec:
     containers:
     - args:
@@ -1382,7 +1382,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-metal-ovn-ipv6-external-oidc-configure-techpreview
+      - --target=e2e-metal-ovn-ipv6-external-oidc-configure
       - --variant=periodics
       command:
       - ci-operator
@@ -1449,7 +1449,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv6-external-oidc-rollback-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv6-external-oidc-revertoauth
   spec:
     containers:
     - args:
@@ -1458,7 +1458,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-metal-ovn-ipv6-external-oidc-rollback-techpreview
+      - --target=e2e-metal-ovn-ipv6-external-oidc-revertoauth
       - --variant=periodics
       command:
       - ci-operator
@@ -1525,7 +1525,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv6-external-oidc-uid-extra-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-metal-ovn-ipv6-external-oidc-uid-extra
   spec:
     containers:
     - args:
@@ -1534,7 +1534,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-metal-ovn-ipv6-external-oidc-uid-extra-techpreview
+      - --target=e2e-metal-ovn-ipv6-external-oidc-uid-extra
       - --variant=periodics
       command:
       - ci-operator
@@ -1600,7 +1600,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-vsphere-external-oidc-configure-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-vsphere-external-oidc-configure
   spec:
     containers:
     - args:
@@ -1609,7 +1609,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-vsphere-external-oidc-configure-techpreview
+      - --target=e2e-vsphere-external-oidc-configure
       - --variant=periodics
       command:
       - ci-operator
@@ -1675,7 +1675,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-vsphere-external-oidc-rollback-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-vsphere-external-oidc-revertoauth
   spec:
     containers:
     - args:
@@ -1684,7 +1684,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-vsphere-external-oidc-rollback-techpreview
+      - --target=e2e-vsphere-external-oidc-revertoauth
       - --variant=periodics
       command:
       - ci-operator
@@ -1750,7 +1750,7 @@ periodics:
     ci.openshift.io/generator: prowgen
     job-release: "4.21"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-vsphere-external-oidc-uid-extra-techpreview
+  name: periodic-ci-openshift-cluster-authentication-operator-release-4.21-periodics-e2e-vsphere-external-oidc-uid-extra
   spec:
     containers:
     - args:
@@ -1759,7 +1759,7 @@ periodics:
       - --lease-server-credentials-file=/etc/boskos/credentials
       - --report-credentials-file=/etc/report/credentials
       - --secret-dir=/secrets/ci-pull-credentials
-      - --target=e2e-vsphere-external-oidc-uid-extra-techpreview
+      - --target=e2e-vsphere-external-oidc-uid-extra
       - --variant=periodics
       command:
       - ci-operator