diff --git a/deploy/examples/cluster-on-local-pvc.yaml b/deploy/examples/cluster-on-local-pvc.yaml
index 2963c1720..4e9eadd99 100644
--- a/deploy/examples/cluster-on-local-pvc.yaml
+++ b/deploy/examples/cluster-on-local-pvc.yaml
@@ -160,7 +160,7 @@ apiVersion: ceph.rook.io/v1
 kind: CephCluster
 metadata:
   name: rook-ceph
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 spec:
   dataDirHostPath: /var/lib/rook
   mon:
diff --git a/deploy/examples/dashboard-external-http.yaml b/deploy/examples/dashboard-external-http.yaml
index 82338367f..8d9f72d41 100644
--- a/deploy/examples/dashboard-external-http.yaml
+++ b/deploy/examples/dashboard-external-http.yaml
@@ -15,6 +15,6 @@ spec:
   selector:
     app: rook-ceph-mgr
     mgr_role: active
-    rook_cluster: rook-ceph
+    rook_cluster: rook-ceph # namespace:cluster
   sessionAffinity: None
   type: NodePort
diff --git a/deploy/examples/dashboard-external-https.yaml b/deploy/examples/dashboard-external-https.yaml
index 6a18dd30c..86d46b847 100644
--- a/deploy/examples/dashboard-external-https.yaml
+++ b/deploy/examples/dashboard-external-https.yaml
@@ -15,6 +15,6 @@ spec:
   selector:
     app: rook-ceph-mgr
     mgr_role: active
-    rook_cluster: rook-ceph
+    rook_cluster: rook-ceph # namespace:cluster
   sessionAffinity: None
   type: NodePort
diff --git a/deploy/examples/dashboard-loadbalancer.yaml b/deploy/examples/dashboard-loadbalancer.yaml
index 19fe8eb5c..1785621bd 100644
--- a/deploy/examples/dashboard-loadbalancer.yaml
+++ b/deploy/examples/dashboard-loadbalancer.yaml
@@ -15,6 +15,6 @@ spec:
   selector:
     app: rook-ceph-mgr
     mgr_role: active
-    rook_cluster: rook-ceph
+    rook_cluster: rook-ceph # namespace:cluster
   sessionAffinity: None
   type: LoadBalancer
diff --git a/deploy/examples/monitoring/exporter-service-monitor.yaml b/deploy/examples/monitoring/exporter-service-monitor.yaml
index 10a0b7934..f195f490e 100644
--- a/deploy/examples/monitoring/exporter-service-monitor.yaml
+++ b/deploy/examples/monitoring/exporter-service-monitor.yaml
@@ -12,7 +12,7 @@ spec:
   selector:
     matchLabels:
       app: rook-ceph-exporter
-      rook_cluster: rook-ceph
+      rook_cluster: rook-ceph # namespace:cluster
       ceph_daemon_id: exporter
   endpoints:
     - port: ceph-exporter-http-metrics
diff --git a/deploy/examples/monitoring/service-monitor.yaml b/deploy/examples/monitoring/service-monitor.yaml
index 9bf062687..7ef491f42 100644
--- a/deploy/examples/monitoring/service-monitor.yaml
+++ b/deploy/examples/monitoring/service-monitor.yaml
@@ -12,7 +12,7 @@ spec:
   selector:
     matchLabels:
       app: rook-ceph-mgr
-      rook_cluster: rook-ceph
+      rook_cluster: rook-ceph # namespace:cluster
   endpoints:
     - port: http-metrics
       path: /metrics
diff --git a/deploy/examples/nfs-load-balancer.yaml b/deploy/examples/nfs-load-balancer.yaml
index 4b7f82afe..5fcf73d96 100644
--- a/deploy/examples/nfs-load-balancer.yaml
+++ b/deploy/examples/nfs-load-balancer.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: rook-ceph-nfs-my-nfs-load-balancer
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 spec:
   ports:
     - name: nfs
diff --git a/deploy/examples/osd-env-override.yaml b/deploy/examples/osd-env-override.yaml
index 454ccc50a..2eb80a8d0 100644
--- a/deploy/examples/osd-env-override.yaml
+++ b/deploy/examples/osd-env-override.yaml
@@ -8,7 +8,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: rook-ceph-osd-env-override
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 data:
   # Bypass the ASan's assertion that it is the very first loaded DSO.
   # This is necessary for crimson-osd as it's currently built with
diff --git a/deploy/examples/pool-mirrored.yaml b/deploy/examples/pool-mirrored.yaml
index 7fe22d198..4b7a16a2a 100644
--- a/deploy/examples/pool-mirrored.yaml
+++ b/deploy/examples/pool-mirrored.yaml
@@ -7,7 +7,7 @@ apiVersion: ceph.rook.io/v1
 kind: CephBlockPool
 metadata:
   name: mirrored-pool
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 spec:
   replicated:
     size: 3
diff --git a/deploy/examples/sqlitevfs-client.yaml b/deploy/examples/sqlitevfs-client.yaml
index f6fc9674f..a821bd292 100644
--- a/deploy/examples/sqlitevfs-client.yaml
+++ b/deploy/examples/sqlitevfs-client.yaml
@@ -6,7 +6,7 @@ apiVersion: ceph.rook.io/v1
 kind: CephClient
 metadata:
   name: sqlitevfs
-  namespace: rook-ceph
+  namespace: rook-ceph # namespace:cluster
 spec:
   caps:
     mon: 'allow r'
diff --git a/deploy/examples/volume-replication-class.yaml b/deploy/examples/volume-replication-class.yaml
index 5700285cf..312c0a2ea 100644
--- a/deploy/examples/volume-replication-class.yaml
+++ b/deploy/examples/volume-replication-class.yaml
@@ -9,4 +9,4 @@ spec:
     schedulingInterval: "12m"
     schedulingStartTime: "16:18:43"
     replication.storage.openshift.io/replication-secret-name: rook-csi-rbd-provisioner
-    replication.storage.openshift.io/replication-secret-namespace: rook-ceph
+    replication.storage.openshift.io/replication-secret-namespace: rook-ceph # namespace:operator