diff --git a/manifests/01-namespace.yaml b/manifests/01-namespace.yaml
index 946162601..a0f4056e7 100644
--- a/manifests/01-namespace.yaml
+++ b/manifests/01-namespace.yaml
@@ -2,9 +2,9 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
     openshift.io/node-selector: ""
     workload.openshift.io/allowed: "management"
   labels:
diff --git a/manifests/010-prometheus-rules.yaml b/manifests/010-prometheus-rules.yaml
index 11a0cb1af..85a763444 100644
--- a/manifests/010-prometheus-rules.yaml
+++ b/manifests/010-prometheus-rules.yaml
@@ -6,9 +6,9 @@ metadata:
   name: samples-operator-alerts
   namespace: openshift-cluster-samples-operator
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 spec:
   groups:
   - name: SamplesOperator
@@ -95,4 +95,4 @@ spec:
           provided in the 'imagestreamtag-to-image' config map in the 'openshift-cluster-samples-operator' namespace to
           assist the mirroring process.
           Or, the use of allowed registries or blocked registries with global imagestream configuration will not allow
-          samples operator to create imagestreams using the default image registry 'registry.redhat.io'.
\ No newline at end of file
+          samples operator to create imagestreams using the default image registry 'registry.redhat.io'.
diff --git a/manifests/02-sa.yaml b/manifests/02-sa.yaml
index 2ed5de467..b21011ef3 100644
--- a/manifests/02-sa.yaml
+++ b/manifests/02-sa.yaml
@@ -5,6 +5,6 @@ metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
   annotations:
+    capability.openshift.io/name: openshift-samples
     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/03-rbac-imageconfig-role-binding.yaml b/manifests/03-rbac-imageconfig-role-binding.yaml
index 00ccb1613..3629c9868 100644
--- a/manifests/03-rbac-imageconfig-role-binding.yaml
+++ b/manifests/03-rbac-imageconfig-role-binding.yaml
@@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator-imageconfig-reader
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 subjects:
   - kind: ServiceAccount
     name: cluster-samples-operator
diff --git a/manifests/03-rbac-imageconfig-role.yaml b/manifests/03-rbac-imageconfig-role.yaml
index cd1d43488..1ba527f78 100644
--- a/manifests/03-rbac-imageconfig-role.yaml
+++ b/manifests/03-rbac-imageconfig-role.yaml
@@ -3,9 +3,9 @@ kind: ClusterRole
 metadata:
   name: cluster-samples-operator-imageconfig-reader
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 rules:
   - apiGroups:
       - config.openshift.io
diff --git a/manifests/03-rbac-proxies-role-binding.yaml b/manifests/03-rbac-proxies-role-binding.yaml
index a67850971..b85acf8a8 100644
--- a/manifests/03-rbac-proxies-role-binding.yaml
+++ b/manifests/03-rbac-proxies-role-binding.yaml
@@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator-proxy-reader
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 subjects:
   - kind: ServiceAccount
     name: cluster-samples-operator
diff --git a/manifests/03-rbac-proxies-role.yaml b/manifests/03-rbac-proxies-role.yaml
index 365471fac..c2c58731f 100644
--- a/manifests/03-rbac-proxies-role.yaml
+++ b/manifests/03-rbac-proxies-role.yaml
@@ -3,9 +3,9 @@ kind: ClusterRole
 metadata:
   name: cluster-samples-operator-proxy-reader
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 rules:
   - apiGroups:
       - config.openshift.io
diff --git a/manifests/03-rbac.yaml b/manifests/03-rbac.yaml
index 4e7c303a5..b1ec1112d 100644
--- a/manifests/03-rbac.yaml
+++ b/manifests/03-rbac.yaml
@@ -4,9 +4,9 @@ metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 rules:
 - apiGroups:
   - ""
@@ -37,9 +37,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 rules:
 - apiGroups:
   - samples.operator.openshift.io
@@ -65,9 +65,9 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true"
   name: system:openshift:cluster-samples-operator:cluster-reader
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 rules:
 - apiGroups:
   - samples.operator.openshift.io
@@ -87,9 +87,9 @@ metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 subjects:
 - kind: ServiceAccount
   name: cluster-samples-operator
@@ -105,9 +105,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 subjects:
 - kind: ServiceAccount
   name: cluster-samples-operator
diff --git a/manifests/04-openshift-rbac.yaml b/manifests/04-openshift-rbac.yaml
index 27538c469..3d80bb19f 100644
--- a/manifests/04-openshift-rbac.yaml
+++ b/manifests/04-openshift-rbac.yaml
@@ -4,9 +4,9 @@ metadata:
   name: cluster-samples-operator-openshift-edit
   namespace: openshift
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 subjects:
 - kind: ServiceAccount
   name: cluster-samples-operator
diff --git a/manifests/05-kube-system-rbac.yaml b/manifests/05-kube-system-rbac.yaml
index 37e68264a..fc0cd8205 100644
--- a/manifests/05-kube-system-rbac.yaml
+++ b/manifests/05-kube-system-rbac.yaml
@@ -4,9 +4,9 @@ metadata:
   name: coreos-pull-secret-reader
   namespace: openshift-config
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 rules:
 - apiGroups:
   - ""
@@ -25,9 +25,9 @@ metadata:
   name: cluster-samples-operator-openshift-config-secret-reader
   namespace: openshift-config
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 subjects:
 - kind: ServiceAccount
   name: cluster-samples-operator
diff --git a/manifests/06-metricsservice.yaml b/manifests/06-metricsservice.yaml
index e7015ce9c..f44223f08 100644
--- a/manifests/06-metricsservice.yaml
+++ b/manifests/06-metricsservice.yaml
@@ -3,9 +3,9 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
     service.beta.openshift.io/serving-cert-secret-name: samples-operator-tls
   labels:
     name: cluster-samples-operator
diff --git a/manifests/06-operator-ibm-cloud-managed.yaml b/manifests/06-operator-ibm-cloud-managed.yaml
index 8195d8a13..3f7bd773f 100644
--- a/manifests/06-operator-ibm-cloud-managed.yaml
+++ b/manifests/06-operator-ibm-cloud-managed.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    capability.openshift.io/name: openshift-samples
     include.release.openshift.io/ibm-cloud-managed: "true"
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
diff --git a/manifests/06-operator.yaml b/manifests/06-operator.yaml
index 4666c1e05..40f1f3dc4 100644
--- a/manifests/06-operator.yaml
+++ b/manifests/06-operator.yaml
@@ -4,8 +4,8 @@ metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
   annotations:
+    capability.openshift.io/name: openshift-samples
     include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
 spec:
   replicas: 1
   selector:
diff --git a/manifests/06-servicemonitor.yaml b/manifests/06-servicemonitor.yaml
index 15c4fb659..7abe50917 100644
--- a/manifests/06-servicemonitor.yaml
+++ b/manifests/06-servicemonitor.yaml
@@ -5,9 +5,9 @@ metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 spec:
   endpoints:
   - targetPort: 60000
diff --git a/manifests/07-clusteroperator.yaml b/manifests/07-clusteroperator.yaml
index 1b597d770..fcba03f2e 100644
--- a/manifests/07-clusteroperator.yaml
+++ b/manifests/07-clusteroperator.yaml
@@ -3,9 +3,9 @@ kind: ClusterOperator
 metadata:
   name: openshift-samples
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 spec: {}
 status:
   relatedObjects:
diff --git a/manifests/08-openshift-imagestreams.yaml b/manifests/08-openshift-imagestreams.yaml
index 16e27c284..0ef6f2f6e 100644
--- a/manifests/08-openshift-imagestreams.yaml
+++ b/manifests/08-openshift-imagestreams.yaml
@@ -9,7 +9,6 @@ metadata:
   annotations:
     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"
 spec:
   tags:
   - name: latest
@@ -27,7 +26,6 @@ metadata:
   annotations:
     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"
 spec:
   tags:
   - name: latest
@@ -45,7 +43,6 @@ metadata:
   annotations:
     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"
 spec:
   tags:
   - name: latest
@@ -63,7 +60,6 @@ metadata:
   annotations:
     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"
 spec:
   tags:
   - name: latest
@@ -81,7 +77,6 @@ metadata:
   annotations:
     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"
 spec:
   tags:
   - name: latest
@@ -99,7 +94,6 @@ metadata:
   annotations:
     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"
 spec:
   tags:
   - name: latest
@@ -117,7 +111,6 @@ metadata:
   annotations:
     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"
 spec:
   tags:
     - name: latest
@@ -135,7 +128,6 @@ metadata:
   annotations:
     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"
 spec:
   tags:
     - name: v4.4
@@ -156,7 +148,6 @@ metadata:
     release.openshift.io/delete: "true"
     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"
 spec:
   lookupPolicy:
     local: true
diff --git a/manifests/09-servicemonitor-rbac.yaml b/manifests/09-servicemonitor-rbac.yaml
index 2a6515f25..046902c57 100644
--- a/manifests/09-servicemonitor-rbac.yaml
+++ b/manifests/09-servicemonitor-rbac.yaml
@@ -5,9 +5,9 @@ metadata:
   name: prometheus-k8s
   namespace: openshift-cluster-samples-operator
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 rules:
 - apiGroups:
   - ""
@@ -26,9 +26,9 @@ metadata:
   name: prometheus-k8s
   namespace: openshift-cluster-samples-operator
   annotations:
+    capability.openshift.io/name: openshift-samples
     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"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
diff --git a/profile-patches/ibm-cloud-managed/06-operator.yaml-patch b/profile-patches/ibm-cloud-managed/06-operator.yaml-patch
index bc380cb1f..f5724d484 100644
--- a/profile-patches/ibm-cloud-managed/06-operator.yaml-patch
+++ b/profile-patches/ibm-cloud-managed/06-operator.yaml-patch
@@ -1,6 +1,7 @@
-- op: replace
-  path: /metadata/annotations
-  value:
-    include.release.openshift.io/ibm-cloud-managed: "true"
+- op: remove
+  path: /metadata/annotations/include.release.openshift.io~1self-managed-high-availability
+- op: add
+  path: /metadata/annotations/include.release.openshift.io~1ibm-cloud-managed
+  value: "true"
 - op: remove
   path: /spec/template/spec/nodeSelector