diff --git a/manifests/01-rbac-capi.yaml b/manifests/01-rbac-capi.yaml
index c2cb78cb1..45109e0b1 100644
--- a/manifests/01-rbac-capi.yaml
+++ b/manifests/01-rbac-capi.yaml
@@ -7,7 +7,7 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-    release.openshift.io/feature-gate: "TechPreviewNoUpgrade"
+    release.openshift.io/feature-set: "TechPreviewNoUpgrade"
 rules:
 - apiGroups:
   - cluster.x-k8s.io
@@ -27,7 +27,7 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-    release.openshift.io/feature-gate: "TechPreviewNoUpgrade"
+    release.openshift.io/feature-set: "TechPreviewNoUpgrade"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/manifests/04-deployment-capi.yaml b/manifests/04-deployment-capi.yaml
index 1a6f65911..8a2da8496 100644
--- a/manifests/04-deployment-capi.yaml
+++ b/manifests/04-deployment-capi.yaml
@@ -10,7 +10,7 @@ metadata:
     exclude.release.openshift.io/internal-openshift-hosted: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-    release.openshift.io/feature-gate: "TechPreviewNoUpgrade"
+    release.openshift.io/feature-set: "TechPreviewNoUpgrade"
 spec:
   strategy:
     type: Recreate