diff --git a/ci-operator/config/openshift/installer/openshift-installer-main.yaml b/ci-operator/config/openshift/installer/openshift-installer-main.yaml
index 2844f6aa156f8..a033fcf681392 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-main.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-main.yaml
@@ -405,15 +405,20 @@ tests:
     - chain: cucushift-installer-check-cluster-health
   timeout: 4h0m0s
 - always_run: false
-  as: e2e-aws-custom-dns
+  as: e2e-aws-custom-dns-techpreview
   optional: true
   run_if_changed: aws
   steps:
     cluster_profile: aws-qe
     env:
       AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
-      FEATURE_GATES: '["AWSClusterHostedDNSInstall=true"]'
-      FEATURE_SET: CustomNoUpgrade
+      FEATURE_SET: TechPreviewNoUpgrade
+      TEST_SKIPS: DNS should provide DNS for the cluster \| Aggregator Should be able
+        to support the 1.17 Sample API Server using the current Aggregator \| Ensure
+        HTTPRoute object is created \| Ensure LB, service, and dnsRecord are created
+        for a Gateway object \| The HAProxy router should pass the http2 tests \|
+        The HAProxy router should pass the gRPC interoperability tests \| Services
+        should fail health check node port if there are only terminating endpoints
       USER_PROVISIONED_DNS: "yes"
     workflow: openshift-e2e-aws-custom-dns
   timeout: 6h0m0s
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml
index 0ba7ba671fe0c..adccbd6352d1c 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.20.yaml
@@ -406,15 +406,20 @@ tests:
     - chain: cucushift-installer-check-cluster-health
   timeout: 4h0m0s
 - always_run: false
-  as: e2e-aws-custom-dns
+  as: e2e-aws-custom-dns-techpreview
   optional: true
   run_if_changed: aws
   steps:
     cluster_profile: aws-qe
     env:
       AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
-      FEATURE_GATES: '["AWSClusterHostedDNSInstall=true"]'
-      FEATURE_SET: CustomNoUpgrade
+      FEATURE_SET: TechPreviewNoUpgrade
+      TEST_SKIPS: DNS should provide DNS for the cluster \| Aggregator Should be able
+        to support the 1.17 Sample API Server using the current Aggregator \| Ensure
+        HTTPRoute object is created \| Ensure LB, service, and dnsRecord are created
+        for a Gateway object \| The HAProxy router should pass the http2 tests \|
+        The HAProxy router should pass the gRPC interoperability tests \| Services
+        should fail health check node port if there are only terminating endpoints
       USER_PROVISIONED_DNS: "yes"
     workflow: openshift-e2e-aws-custom-dns
   timeout: 6h0m0s
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml
index 247cf8187cd55..40f1fb60df549 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.21.yaml
@@ -405,15 +405,20 @@ tests:
     - chain: cucushift-installer-check-cluster-health
   timeout: 4h0m0s
 - always_run: false
-  as: e2e-aws-custom-dns
+  as: e2e-aws-custom-dns-techpreview
   optional: true
   run_if_changed: aws
   steps:
     cluster_profile: aws-qe
     env:
       AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
-      FEATURE_GATES: '["AWSClusterHostedDNSInstall=true"]'
-      FEATURE_SET: CustomNoUpgrade
+      FEATURE_SET: TechPreviewNoUpgrade
+      TEST_SKIPS: DNS should provide DNS for the cluster \| Aggregator Should be able
+        to support the 1.17 Sample API Server using the current Aggregator \| Ensure
+        HTTPRoute object is created \| Ensure LB, service, and dnsRecord are created
+        for a Gateway object \| The HAProxy router should pass the http2 tests \|
+        The HAProxy router should pass the gRPC interoperability tests \| Services
+        should fail health check node port if there are only terminating endpoints
       USER_PROVISIONED_DNS: "yes"
     workflow: openshift-e2e-aws-custom-dns
   timeout: 6h0m0s
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml
index 537979307512a..71d54c39bffb8 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml
@@ -1059,7 +1059,7 @@ presubmits:
     - ^main$
     - ^main-
     cluster: build01
-    context: ci/prow/e2e-aws-custom-dns
+    context: ci/prow/e2e-aws-custom-dns-techpreview
     decorate: true
     decoration_config:
       timeout: 6h0m0s
@@ -1068,9 +1068,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-qe
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-installer-main-e2e-aws-custom-dns
+    name: pull-ci-openshift-installer-main-e2e-aws-custom-dns-techpreview
     optional: true
-    rerun_command: /test e2e-aws-custom-dns
+    rerun_command: /test e2e-aws-custom-dns-techpreview
     run_if_changed: aws
     spec:
       containers:
@@ -1080,7 +1080,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-custom-dns
+        - --target=e2e-aws-custom-dns-techpreview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1128,7 +1128,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-custom-dns,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-custom-dns-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.20-presubmits.yaml
index 2067955e77392..3bba18f586c51 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.20-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.20-presubmits.yaml
@@ -1057,7 +1057,7 @@ presubmits:
     - ^release-4\.20$
     - ^release-4\.20-
     cluster: build01
-    context: ci/prow/e2e-aws-custom-dns
+    context: ci/prow/e2e-aws-custom-dns-techpreview
     decorate: true
     decoration_config:
       timeout: 6h0m0s
@@ -1066,9 +1066,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-qe
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-installer-release-4.20-e2e-aws-custom-dns
+    name: pull-ci-openshift-installer-release-4.20-e2e-aws-custom-dns-techpreview
     optional: true
-    rerun_command: /test e2e-aws-custom-dns
+    rerun_command: /test e2e-aws-custom-dns-techpreview
     run_if_changed: aws
     spec:
       containers:
@@ -1078,7 +1078,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-custom-dns
+        - --target=e2e-aws-custom-dns-techpreview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1126,7 +1126,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-custom-dns,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-custom-dns-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches:
diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.21-presubmits.yaml
index fc2adff283844..cd48b078baeb5 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.21-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.21-presubmits.yaml
@@ -1058,7 +1058,7 @@ presubmits:
     - ^release-4\.21$
     - ^release-4\.21-
     cluster: build01
-    context: ci/prow/e2e-aws-custom-dns
+    context: ci/prow/e2e-aws-custom-dns-techpreview
     decorate: true
     decoration_config:
       timeout: 6h0m0s
@@ -1067,9 +1067,9 @@ presubmits:
       ci-operator.openshift.io/cloud-cluster-profile: aws-qe
       ci.openshift.io/generator: prowgen
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-installer-release-4.21-e2e-aws-custom-dns
+    name: pull-ci-openshift-installer-release-4.21-e2e-aws-custom-dns-techpreview
     optional: true
-    rerun_command: /test e2e-aws-custom-dns
+    rerun_command: /test e2e-aws-custom-dns-techpreview
     run_if_changed: aws
     spec:
       containers:
@@ -1079,7 +1079,7 @@ presubmits:
         - --lease-server-credentials-file=/etc/boskos/credentials
         - --report-credentials-file=/etc/report/credentials
         - --secret-dir=/secrets/ci-pull-credentials
-        - --target=e2e-aws-custom-dns
+        - --target=e2e-aws-custom-dns-techpreview
         command:
         - ci-operator
         image: ci-operator:latest
@@ -1127,7 +1127,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )e2e-aws-custom-dns,?($|\s.*)
+    trigger: (?m)^/test( | .* )e2e-aws-custom-dns-techpreview,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: