diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml
index 3833fd411..0f61fa7f5 100644
--- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml
@@ -517,6 +517,9 @@ spec:
       - path: agent.ebpf.flowFilter
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:hidden
+      - path: agent.ebpf.metrics.enable
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:hidden
       - description: to use Kafka as a broker as part of the flow collection pipeline.
         displayName: Kafka configuration
         path: kafka
@@ -603,6 +606,9 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:fieldDependency:deploymentModel:Kafka
         - urn:alm:descriptor:com.tectonic.ui:advanced
+      - path: processor.subnetLabels.openShiftAutoDetect
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:hidden
       - displayName: Log level
         path: processor.logLevel
         x-descriptors:
@@ -732,8 +738,6 @@ spec:
         path: agent.ebpf.metrics
       - displayName: Disable alerts
         path: agent.ebpf.metrics.disableAlerts
-      - displayName: Enable
-        path: agent.ebpf.metrics.enable
       - displayName: Server
         path: agent.ebpf.metrics.server
       - displayName: Port
@@ -788,8 +792,6 @@ spec:
         path: processor.subnetLabels
       - displayName: Custom labels
         path: processor.subnetLabels.customLabels
-      - displayName: Open shift auto detect
-        path: processor.subnetLabels.openShiftAutoDetect
       - displayName: Prometheus
         path: prometheus
       - displayName: Querier
diff --git a/config/csv/bases/netobserv-operator.clusterserviceversion.yaml b/config/csv/bases/netobserv-operator.clusterserviceversion.yaml
index b1be749a1..1c2d56adf 100644
--- a/config/csv/bases/netobserv-operator.clusterserviceversion.yaml
+++ b/config/csv/bases/netobserv-operator.clusterserviceversion.yaml
@@ -39,6 +39,7 @@ spec:
       name: flowcollectors.flows.netobserv.io
       version: v1beta2
       specDescriptors:
+        # Reference: https://github.com/openshift/console/blob/master/frontend/packages/operator-lifecycle-manager/src/components/descriptors/reference/reference.md
         # ROOT
         - description: defines the desired type of deployment for flow processing.
           path: deploymentModel
@@ -88,6 +89,9 @@ spec:
         - path: agent.ebpf.flowFilter
           x-descriptors:
             - urn:alm:descriptor:com.tectonic.ui:hidden
+        - path: agent.ebpf.metrics.enable
+          x-descriptors:
+            - urn:alm:descriptor:com.tectonic.ui:hidden
         # KAFKA
         - description: to use Kafka as a broker as part of the flow collection pipeline.
           displayName: Kafka configuration
@@ -170,6 +174,9 @@ spec:
           x-descriptors:
             - urn:alm:descriptor:com.tectonic.ui:fieldDependency:deploymentModel:Kafka
             - urn:alm:descriptor:com.tectonic.ui:advanced
+        - path: processor.subnetLabels.openShiftAutoDetect
+          x-descriptors:
+            - urn:alm:descriptor:com.tectonic.ui:hidden
         - path: processor.logLevel
           x-descriptors:
             - urn:alm:descriptor:com.tectonic.ui:advanced