diff --git a/manifests/00-cluster-role-sail-library.yaml b/manifests/00-cluster-role-sail-library.yaml
index 71d4c4f80..9912d1d67 100644
--- a/manifests/00-cluster-role-sail-library.yaml
+++ b/manifests/00-cluster-role-sail-library.yaml
@@ -31,7 +31,7 @@ metadata:
   name: openshift-ingress-operator-sail-library
   annotations:
     capability.openshift.io/name: Ingress
-    release.openshift.io/feature-set: DevPreviewNoUpgrade,TechPreviewNoUpgrade # Remove when GA
+    release.openshift.io/feature-gate: GatewayAPIWithoutOLM
     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"
diff --git a/manifests/01-cluster-role-binding-sail-library.yaml b/manifests/01-cluster-role-binding-sail-library.yaml
index 467193d47..10f47823c 100644
--- a/manifests/01-cluster-role-binding-sail-library.yaml
+++ b/manifests/01-cluster-role-binding-sail-library.yaml
@@ -7,7 +7,7 @@ metadata:
   name: openshift-ingress-operator-sail-library
   annotations:
     capability.openshift.io/name: Ingress
-    release.openshift.io/feature-set: DevPreviewNoUpgrade,TechPreviewNoUpgrade # Remove when GA
+    release.openshift.io/feature-gate: GatewayAPIWithoutOLM
     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"