diff --git a/enhancements/installer/component-selection.md b/enhancements/installer/component-selection.md
index 519d2f15ab..5578e443b4 100644
--- a/enhancements/installer/component-selection.md
+++ b/enhancements/installer/component-selection.md
@@ -150,7 +150,7 @@ excluded while ServiceMonitors associated with other capabilities would not be).
 To determine which manifests are managed for a given cluster, the CVO will:
 
 1. Start with all the manifests in the payload.
-2. If TechPreviewNoUpgrade is not set, [remove all the manifests with `release.openshift.io/feature-gate=TechPreviewNoUpgrade`](../update/cvo-techpreview-manifests.md).
+2. If TechPreviewNoUpgrade is not set, [remove all the manifests with `release.openshift.io/feature-set=TechPreviewNoUpgrade`](../update/cvo-techpreview-manifests.md).
 3. Remove all the manifests that lack [`include.release.openshift.io/{profile}=true`](../update/cluster-profiles.md).
 4. Remove all the manifests that declare a capability in `capability.openshift.io/name` which is not part of the current enabled capabilities.
 
diff --git a/enhancements/olm/platform-operators.md b/enhancements/olm/platform-operators.md
index 576e7a8a7e..df1cc5b078 100644
--- a/enhancements/olm/platform-operators.md
+++ b/enhancements/olm/platform-operators.md
@@ -233,7 +233,7 @@ spec:
   featureSet: TechPreviewNoUpgrade
 ```
 
-Enabling the tech preview feature set will result in the installation of the PO components in the cluster. This requires adding the "release.openshift.io/feature-gate" annotation key to the PO's downstream CVO manifests, and setting that key's value to "TechPreviewNoUpgrade".
+Enabling the tech preview feature set will result in the installation of the PO components in the cluster. This requires adding the "release.openshift.io/feature-set" annotation key to the PO's downstream CVO manifests, and setting that key's value to "TechPreviewNoUpgrade".
 
 #### Reconcile POM "aggregate" ClusterOperator object
 
@@ -522,7 +522,7 @@ type PlatformOperator struct {
 
 #### Mitigations
 
-The v1alpha1 CRDs won't be deployed by default, and those APIs will be hidden behind the "TechPreviewNoUpgrade" feature set that admins need to explicitly enable before cluster creation. Any new components introduced during these early phases will also specify the `release.openshift.io/feature-gate` annotation in their CVO manifests, and set that key's value to "TechPreviewNoUpgrade".
+The v1alpha1 CRDs won't be deployed by default, and those APIs will be hidden behind the "TechPreviewNoUpgrade" feature set that admins need to explicitly enable before cluster creation. Any new components introduced during these early phases will also specify the `release.openshift.io/feature-set` annotation in their CVO manifests, and set that key's value to "TechPreviewNoUpgrade".
 This annotation will ensure that the CVO won't deploy any tech preview components in a non-tech preview cluster.
 
 The BundleDeployment API is a cluster-scoped API, which means that only users with wildcard permissions should be able to access this API by default. It's recommended that admins should limit access to the BundleDeployment API to the minimum set of users in order to mitigate the plain provisioner's wide net of permissions. This behavior may require explicit downstream documentation.