diff --git a/ci-operator/config/openshift/cloud-provider-aws/openshift-cloud-provider-aws-main.yaml b/ci-operator/config/openshift/cloud-provider-aws/openshift-cloud-provider-aws-main.yaml
index 517770e034ada..1ba525a84353b 100644
--- a/ci-operator/config/openshift/cloud-provider-aws/openshift-cloud-provider-aws-main.yaml
+++ b/ci-operator/config/openshift/cloud-provider-aws/openshift-cloud-provider-aws-main.yaml
@@ -119,8 +119,6 @@ tests:
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
-    env:
-      FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-ccm-techpreview
 - as: e2e-aws-ovn-cgroupsv2
   optional: true
diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml
index dc85ecba663ea..b71218773eef8 100644
--- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml
+++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml
@@ -94,8 +94,6 @@ tests:
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: aws
-    env:
-      FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-ccm-techpreview
 - always_run: false
   as: e2e-azure-manual-oidc
diff --git a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.21.yaml b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.21.yaml
index d56916d86d023..d37f90b30e356 100644
--- a/ci-operator/config/openshift/release/openshift-release-master__nightly-4.21.yaml
+++ b/ci-operator/config/openshift/release/openshift-release-master__nightly-4.21.yaml
@@ -171,8 +171,6 @@ tests:
   interval: 168h
   steps:
     cluster_profile: aws
-    env:
-      FEATURE_SET: TechPreviewNoUpgrade
     workflow: openshift-e2e-aws-ccm-techpreview
 - as: e2e-metal-ovn-single-node-rt-upgrade
   interval: 168h
diff --git a/ci-operator/step-registry/openshift/e2e/aws/ccm/techpreview/openshift-e2e-aws-ccm-techpreview-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/ccm/techpreview/openshift-e2e-aws-ccm-techpreview-workflow.yaml
index 81b307f466477..f66f4d11ab810 100644
--- a/ci-operator/step-registry/openshift/e2e/aws/ccm/techpreview/openshift-e2e-aws-ccm-techpreview-workflow.yaml
+++ b/ci-operator/step-registry/openshift/e2e/aws/ccm/techpreview/openshift-e2e-aws-ccm-techpreview-workflow.yaml
@@ -5,7 +5,6 @@ workflow:
     - chain: ipi-conf-aws
     - ref: ingress-aws-conf-lbtype-nlb
     - chain: ipi-install
-    - ref: ccm-conf-apply-feature-gate
     - ref: ccm-gather-service-aws
     test:
     - ref: openshift-e2e-test
@@ -14,6 +13,7 @@ workflow:
     - ref: ccm-must-gather
     - chain: ipi-aws-post
     env:
+      FEATURE_SET: TechPreviewNoUpgrade
       TEST_SKIPS: >-
         Managed cluster should \[apigroup:config.openshift.io\] start all core operators\|
         Alerts shouldn't report any unexpected alerts in firing or pending state\|