From c71a4774f6fbd9144f5febaccdefaeaa290cad8e Mon Sep 17 00:00:00 2001
From: SanjalKatiyar <sanjaldhir@gmail.com>
Date: Tue, 21 Nov 2023 13:34:35 +0530
Subject: [PATCH] refactoring (support multiple StorageSystems per ODF)

---
 locales/en/plugin__odf-console.json           |  10 +-
 .../mco/components/mco-dashboard/queries.ts   |   6 +-
 .../status-card/status-card.tsx               |   4 +
 .../system-capacity-card/capacity-card.tsx    |  16 +-
 .../ocs/block-pool/BlockPoolDetailsPage.tsx   |  32 ++-
 packages/ocs/block-pool/BlockPoolListPage.tsx |  84 +++----
 packages/ocs/block-pool/CreateBlockPool.tsx   |  49 ++--
 packages/ocs/block-pool/body.tsx              |  10 +-
 packages/ocs/constants/common.ts              |   3 -
 .../block-pool/compression-details-card.tsx   |  28 ++-
 .../dashboards/block-pool/inventory-card.tsx  |   1 -
 .../block-pool/raw-capacity-card.tsx          |  22 +-
 .../block-pool/utilization-card.tsx           |  13 +-
 .../status-card/status-card.tsx               |  21 +-
 .../activity-card/activity-card.tsx           |  56 +++--
 .../buckets-card/buckets-card.tsx             |  79 ++++---
 .../capacity-breakdown-card.spec.tsx          |  13 +-
 .../capacity-breakdown-card.tsx               |  43 ++--
 .../data-consumption-card-dropdown.tsx        |   4 +-
 .../data-consumption-card.tsx                 |  31 ++-
 .../details-card/details-card.tsx             |  20 +-
 .../resource-providers-card.tsx               |  56 +++--
 .../status-card/status-card.tsx               |  46 ++--
 .../storage-efficiency-card.tsx               |  24 +-
 .../ocs/dashboards/ocs-system-dashboard.tsx   |  24 +-
 .../ocs/dashboards/odf-system-dashboard.tsx   |  22 +-
 .../persistent-external/breakdown-card.tsx    |  13 +-
 .../persistent-external/details-card.tsx      |  37 +--
 .../persistent-external/status-card.tsx       |  17 +-
 .../persistent-external/utilization-card.tsx  |  15 +-
 .../activity-card/activity-card.tsx           |  32 ++-
 .../capacity-breakdown-card.tsx               |  24 +-
 .../persistent-internal/details-card.tsx      |  27 ++-
 .../persistent-internal/inventory-card.tsx    |   7 +-
 .../raw-capacity-card/raw-capacity-card.tsx   |  17 +-
 .../status-card/status-card.tsx               |  30 ++-
 .../persistent-internal/status-card/utils.ts  |  48 +---
 .../storage-efficiency-card.tsx               |  11 +-
 .../utilization-card/utilization-card.tsx     |  36 ++-
 packages/ocs/hooks/useOcsHealth.ts            | 215 +++++++++++-------
 .../block-pool/create-block-pool-modal.tsx    |  47 ++--
 .../block-pool/delete-block-pool-modal.tsx    |  42 ++--
 .../block-pool/update-block-pool-modal.tsx    |  30 +--
 packages/ocs/queries/ceph-storage.spec.ts     |  26 ++-
 packages/ocs/queries/ceph-storage.ts          | 214 +++++++++--------
 packages/ocs/queries/object-storage.ts        |  53 +++--
 packages/ocs/storage-class/sc-form.tsx        |  24 +-
 packages/ocs/types.ts                         |   2 +
 packages/ocs/utils/block-pool.tsx             |   8 +-
 packages/ocs/utils/ceph-health.ts             |  32 ++-
 packages/ocs/utils/common.ts                  |  46 ++--
 packages/ocs/utils/noobaa-health.ts           |   8 +-
 .../components/alerts/alert-action-path.tsx   |  25 +-
 .../HealthOverview.tsx                        |  16 +-
 .../create-storage-system/footer.tsx          |  15 +-
 .../create-storage-system/payloads.ts         |   4 +-
 .../mcg/CreateObjectBucketClaim.tsx           |   3 +-
 .../namespace-store-dropdown.tsx              |   3 +-
 .../object-service.tsx                        |   3 -
 .../performance-card/performance-card.tsx     |  14 +-
 .../odf-dashboard/performance-card/utils.ts   |   5 +
 .../odf/components/odf-dashboard/queries.ts   |   2 +-
 .../odf-dashboard/status-card/status-card.tsx |  27 ++-
 .../system-capacity-card/capacity-card.tsx    |  39 ++--
 .../system-list/odf-system-list.tsx           |  15 +-
 .../components/system-list/system-link.tsx    |   4 +-
 packages/odf/components/topology/Topology.tsx |  55 ++++-
 .../storage-cluster/StorageClusterDetails.tsx |  31 +--
 .../storage-cluster/StorageClusterObserve.tsx |  17 +-
 .../odf/components/topology/topology.scss     |  10 +
 packages/odf/components/utils/common.ts       |   8 +-
 packages/odf/constants/common.ts              |   4 +-
 packages/odf/features.ts                      |  35 ++-
 .../add-capacity/add-capacity-modal.tsx       |  25 +-
 packages/odf/queries/common.ts                |  11 +-
 packages/odf/redux/actions/index.ts           |   1 +
 .../odf/redux/actions/odf-system-flags.ts     |  33 +++
 packages/odf/redux/combineReducers.ts         |   8 +-
 packages/odf/redux/dispatchers/index.ts       |   1 +
 .../odf/redux/dispatchers/odf-system-flags.ts |  16 ++
 packages/odf/redux/provider-hooks/index.ts    |   1 +
 .../redux/provider-hooks/useODFNamespace.ts   |   3 +-
 .../redux/provider-hooks/useODFSystemFlags.ts | 146 ++++++++++++
 packages/odf/redux/reducers/index.ts          |   1 +
 .../odf/redux/reducers/odf-system-flags.ts    |  29 +++
 packages/odf/redux/selectors/index.ts         |   1 +
 packages/odf/redux/selectors/odf-namespace.ts |   2 +-
 .../odf/redux/selectors/odf-system-flags.ts   |  11 +
 packages/odf/resources.ts                     |   2 -
 packages/odf/utils/odf.ts                     |  38 +++-
 .../capacity-card/capacity-card.tsx           |   9 +-
 .../src/dashboards/status-card/states.tsx     |  12 +
 packages/shared/src/modals/DeleteModal.tsx    |   2 +-
 packages/shared/src/selectors/k8s.ts          |  10 +
 packages/shared/src/types/storage.ts          |   2 +
 packages/shared/src/utils/common.ts           |   8 +-
 packages/shared/src/utils/dashboard.ts        |   8 +-
 plugins/odf/console-extensions.json           |  14 +-
 98 files changed, 1649 insertions(+), 858 deletions(-)
 create mode 100644 packages/odf/redux/actions/odf-system-flags.ts
 create mode 100644 packages/odf/redux/dispatchers/odf-system-flags.ts
 create mode 100644 packages/odf/redux/provider-hooks/useODFSystemFlags.ts
 create mode 100644 packages/odf/redux/reducers/odf-system-flags.ts
 create mode 100644 packages/odf/redux/selectors/odf-system-flags.ts

diff --git a/locales/en/plugin__odf-console.json b/locales/en/plugin__odf-console.json
index 70253b511..003d2a687 100644
--- a/locales/en/plugin__odf-console.json
+++ b/locales/en/plugin__odf-console.json
@@ -376,9 +376,9 @@
   "Estimating {{formattedEta}} to completion": "Estimating {{formattedEta}} to completion",
   "Object_one": "Object",
   "Object_other": "Object",
+  "NooBaa Bucket": "NooBaa Bucket",
   "Buckets": "Buckets",
   "Buckets card represents the number of S3 buckets managed on Multicloud Object Gateway and the number of ObjectBucketClaims and the ObjectBuckets managed on both Multicloud Object Gateway and RGW (if deployed).": "Buckets card represents the number of S3 buckets managed on Multicloud Object Gateway and the number of ObjectBucketClaims and the ObjectBuckets managed on both Multicloud Object Gateway and RGW (if deployed).",
-  "NooBaa Bucket": "NooBaa Bucket",
   "Cluster-wide": "Cluster-wide",
   "Any NON Object bucket claims that were created via an S3 client or via the NooBaa UI system.": "Any NON Object bucket claims that were created via an S3 client or via the NooBaa UI system.",
   "Break by": "Break by",
@@ -919,7 +919,6 @@
   "Num Volumes": "Num Volumes",
   "Raw Capacity": "Raw Capacity",
   "Add Capacity": "Add Capacity",
-  "External": "External",
   "Cluster details": "Cluster details",
   "Data resiliency": "Data resiliency",
   "Nodes": "Nodes",
@@ -929,8 +928,11 @@
   "Search...": "Search...",
   "Expand to fullscreen": "Expand to fullscreen",
   "Exit fullscreen": "Exit fullscreen",
+  "This view is only supported for Internal mode cluster.": "This view is only supported for Internal mode cluster.",
+  "Show message": "Show message",
+  "Hide message": "Hide message",
   "Back to main view": "Back to main view",
-  "Topology view is not supported for External Mode": "Topology view is not supported for External Mode",
+  "Topology view is not supported for External mode": "Topology view is not supported for External mode",
   "No StorageCluster found": "No StorageCluster found",
   "Set up a storage cluster to view the topology": "Set up a storage cluster to view the topology",
   "A minimal cluster deployment will be performed.": "A minimal cluster deployment will be performed.",
@@ -980,7 +982,7 @@
   "No StorageClass selected": "No StorageClass selected",
   "The Arbiter stretch cluster requires a minimum of 4 nodes (2 different zones, 2 nodes per zone). Please choose a different StorageClass or create a new LocalVolumeSet that matches the minimum node requirement.": "The Arbiter stretch cluster requires a minimum of 4 nodes (2 different zones, 2 nodes per zone). Please choose a different StorageClass or create a new LocalVolumeSet that matches the minimum node requirement.",
   "The StorageCluster requires a minimum of 3 nodes. Please choose a different StorageClass or create a new LocalVolumeSet that matches the minimum node requirement.": "The StorageCluster requires a minimum of 3 nodes. Please choose a different StorageClass or create a new LocalVolumeSet that matches the minimum node requirement.",
-  "Adding capacity for <1>{{name}}</1>, may increase your expenses.": "Adding capacity for <1>{{name}}</1>, may increase your expenses.",
+  "Adding capacity for <1>{{ocsClusterName}}</1>, may increase your expenses.": "Adding capacity for <1>{{ocsClusterName}}</1>, may increase your expenses.",
   "Currently Used:": "Currently Used:",
   "Add": "Add",
   "{{availableCapacity}} /  {{replica}} replicas": "{{availableCapacity}} /  {{replica}} replicas",
diff --git a/packages/mco/components/mco-dashboard/queries.ts b/packages/mco/components/mco-dashboard/queries.ts
index 60093b9a5..703eea2b2 100644
--- a/packages/mco/components/mco-dashboard/queries.ts
+++ b/packages/mco/components/mco-dashboard/queries.ts
@@ -27,9 +27,8 @@ export const LAST_SYNC_TIME_QUERY = 'ramen_sync_duration_seconds';
 export const getLastSyncPerClusterQuery = () =>
   `${LAST_SYNC_TIME_QUERY}{${DRPC_OBJECT_TYPE}, ${RAMEN_HUB_OPERATOR_METRICS_SERVICE}}`;
 
-// ToDo (epic 4422): Need to update as per updates in the metrics
 export const CAPACITY_QUERIES = {
-  // ToDo (epic 4422): For 4.15, Assuming "managedBy" is unique for each StorageSystem. Need to add "target_namesapce" as an another key.
+  // ToDo (epic 4422): For 4.15, assuming "managedBy" is unique for each StorageSystem (works for now). Need to add "target_namesapce" as an another key to capacity metrics.
   [StorageDashboard.TOTAL_CAPACITY_FILE_BLOCK]: `(label_replace(odf_system_map, "managedBy", "$1", "target_name", "(.*)"))  * on (namespace, managedBy, cluster) group_right(storage_system, target_kind, target_namespace) ${TOTAL_CAPACITY_FILE_BLOCK_METRIC}`,
   [StorageDashboard.USED_CAPACITY_FILE_BLOCK]: `(label_replace(odf_system_map, "managedBy", "$1", "target_name", "(.*)"))  * on (namespace, managedBy, cluster) group_right(storage_system, target_kind, target_namespace) ${USED_CAPACITY_FILE_BLOCK_METRIC}`,
 };
@@ -46,9 +45,8 @@ export const getRBDSnapshotUtilizationQuery = (
   return queries[queryName];
 };
 
-// ToDo (epic 4422): Need to update as per updates in the metrics
 export const STATUS_QUERIES = {
-  // ToDo (epic 4422): For 4.15, Assuming "managedBy" is unique for each StorageSystem. Need to add "target_namesapce" as an another key.
+  // ToDo (epic 4422): For 4.15, assuming "managedBy" is unique for each StorageSystem (works for now). Need to add "target_namesapce" as an another key to health metrics.
   [StorageDashboard.SYSTEM_HEALTH]: `(label_replace(odf_system_map, "managedBy", "$1", "target_name", "(.*)"))  * on (namespace, managedBy, cluster) group_right(storage_system, target_kind, target_namespace) ${SYSTEM_HEALTH_METRIC}`,
   [StorageDashboard.HEALTH]: SYSTEM_HEALTH_METRIC,
   [StorageDashboard.CSV_STATUS]: `csv_succeeded{name=~"${ODF_OPERATOR}.*"}`,
diff --git a/packages/mco/components/mco-dashboard/storage-system/status-card/status-card.tsx b/packages/mco/components/mco-dashboard/storage-system/status-card/status-card.tsx
index 5fb31c7ea..fe5cb1664 100644
--- a/packages/mco/components/mco-dashboard/storage-system/status-card/status-card.tsx
+++ b/packages/mco/components/mco-dashboard/storage-system/status-card/status-card.tsx
@@ -56,6 +56,8 @@ const setSubSystemMap = (
   subSysHealthData: PrometheusResponse,
   subSystemMap: SubSystemMap
 ) =>
+  // ToDo (epic 4422): "namespace" in "odf_system_*" metrics signifies odf-operator pod's namespace.
+  // Add a label to metric for StorageSystem namespace as well and use that instead (update query).
   subSysHealthData?.data?.result?.forEach(
     (item: PrometheusResult) =>
       !item?.metric.managedBy &&
@@ -70,6 +72,8 @@ const setHealthData = (
   healthData: SystemHealthMap[],
   subSystemMap: SubSystemMap
 ) =>
+  // ToDo (epic 4422): "namespace" in "odf_system_*" metrics signifies odf-operator pod's namespace.
+  // Add a label to metric for StorageSystem namespace as well and use that instead (update query).
   sysHealthData?.data?.result?.forEach((item: PrometheusResult) => {
     const { apiGroup } = getGVK(item?.metric.target_kind);
     const healthVal = item?.value[1];
diff --git a/packages/mco/components/mco-dashboard/storage-system/system-capacity-card/capacity-card.tsx b/packages/mco/components/mco-dashboard/storage-system/system-capacity-card/capacity-card.tsx
index 551ce076b..efaaba7bd 100644
--- a/packages/mco/components/mco-dashboard/storage-system/system-capacity-card/capacity-card.tsx
+++ b/packages/mco/components/mco-dashboard/storage-system/system-capacity-card/capacity-card.tsx
@@ -151,12 +151,20 @@ const headerColumns = (t: TFunction) => [
 ];
 
 const getRow: GetRow = (
-  { systemName, targetKind, clusterName, totalValue, usedValue, clusterURL },
+  {
+    systemName,
+    namespace: systemNamespace,
+    targetKind,
+    clusterName,
+    totalValue,
+    usedValue,
+    clusterURL,
+  },
   index
 ) => {
   const { apiGroup, apiVersion, kind } = getGVK(targetKind);
   const systemKind = referenceForGroupVersionKind(apiGroup)(apiVersion)(kind);
-  const systemPath = getDashboardLink(systemKind, systemName);
+  const systemPath = getDashboardLink(systemKind, systemName, systemNamespace);
   const isPercentage = !!totalValue;
   const progress = isPercentage ? getPercentage(usedValue, totalValue) : 100;
   const value = isPercentage
@@ -280,6 +288,8 @@ const SystemCapacityCard: React.FC = () => {
       !loadingUsedCapacity && !errorUsedCapacity
         ? usedCapacity?.data?.result?.reduce(
             (acc: CapacityMetricDatumMap, usedMetric: PrometheusResult) => {
+              // ToDo (epic 4422): "namespace" in "odf_system_*" metrics signifies odf-operator pod's namespace.
+              // Add a label to metric for StorageSystem namespace as well and use that instead (update query).
               const systemName = usedMetric?.metric?.storage_system;
               const namespace = usedMetric?.metric?.target_namespace;
               const targetKind = usedMetric?.metric?.target_kind;
@@ -305,6 +315,8 @@ const SystemCapacityCard: React.FC = () => {
     !loadingTotalCapacity &&
       !errorTotalCapacity &&
       totalCapacity?.data?.result?.forEach((totalMetric: PrometheusResult) => {
+        // ToDo (epic 4422): "namespace" in "odf_system_*" metrics signifies odf-operator pod's namespace.
+        // Add a label to metric for StorageSystem namespace as well and use that instead (update query).
         const dataMapKey = getUniqueKey(
           totalMetric?.metric?.storage_system,
           totalMetric?.metric?.target_namespace,
diff --git a/packages/ocs/block-pool/BlockPoolDetailsPage.tsx b/packages/ocs/block-pool/BlockPoolDetailsPage.tsx
index fad036e7e..5981f0254 100644
--- a/packages/ocs/block-pool/BlockPoolDetailsPage.tsx
+++ b/packages/ocs/block-pool/BlockPoolDetailsPage.tsx
@@ -1,16 +1,15 @@
 import * as React from 'react';
-import { useSafeK8sWatchResource } from '@odf/core/hooks';
-import { useODFNamespaceSelector } from '@odf/core/redux';
 import DetailsPage from '@odf/shared/details-page/DetailsPage';
 import { Kebab } from '@odf/shared/kebab/kebab';
 import { ModalKeys } from '@odf/shared/modals/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { referenceForModel } from '@odf/shared/utils';
 import { EventStreamWrapped, YAMLEditorWrapped } from '@odf/shared/utils/Tabs';
-import { RouteComponentProps, useLocation } from 'react-router-dom';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
+import { RouteComponentProps, useLocation, useParams } from 'react-router-dom';
 import { BlockPoolDashboard } from '../dashboards/block-pool/block-pool-dashboard';
 import { CephBlockPoolModel, CephClusterModel } from '../models';
-import { StoragePoolKind } from '../types';
+import { StoragePoolKind, ODFSystemParams } from '../types';
 
 type BlockPoolDetailsPageProps = {
   match: RouteComponentProps<{ poolName: string }>['match'];
@@ -30,18 +29,15 @@ export const BlockPoolDetailsPage: React.FC<BlockPoolDetailsPageProps> = ({
 
   const { poolName } = match.params;
   const location = useLocation();
+  const { namespace: poolNs } = useParams<ODFSystemParams>();
   const kind = referenceForModel(CephBlockPoolModel);
 
-  const { odfNamespace, isODFNsLoaded, odfNsLoadError } =
-    useODFNamespaceSelector();
-
-  const [resource, loaded, loadError] =
-    useSafeK8sWatchResource<StoragePoolKind>((ns: string) => ({
-      kind,
-      name: poolName,
-      namespace: ns,
-      isList: false,
-    }));
+  const [resource, loaded, loadError] = useK8sWatchResource<StoragePoolKind>({
+    kind,
+    name: poolName,
+    namespace: poolNs,
+    isList: false,
+  });
 
   const breadcrumbs = [
     {
@@ -65,7 +61,7 @@ export const BlockPoolDetailsPage: React.FC<BlockPoolDetailsPageProps> = ({
         extraProps={{
           resource,
           resourceModel: CephBlockPoolModel,
-          namespace: odfNamespace,
+          namespace: poolNs,
         }}
         customKebabItems={[
           {
@@ -85,12 +81,12 @@ export const BlockPoolDetailsPage: React.FC<BlockPoolDetailsPageProps> = ({
         ]}
       />
     );
-  }, [resource, odfNamespace, t]);
+  }, [resource, poolNs, t]);
 
   return (
     <DetailsPage
-      loaded={loaded && isODFNsLoaded}
-      loadError={loadError || odfNsLoadError}
+      loaded={loaded}
+      loadError={loadError}
       breadcrumbs={breadcrumbs}
       actions={actions}
       resourceModel={CephBlockPoolModel}
diff --git a/packages/ocs/block-pool/BlockPoolListPage.tsx b/packages/ocs/block-pool/BlockPoolListPage.tsx
index bb81e9f5e..7490d22b2 100644
--- a/packages/ocs/block-pool/BlockPoolListPage.tsx
+++ b/packages/ocs/block-pool/BlockPoolListPage.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { useSafeK8sWatchResources } from '@odf/core/hooks';
-import { useODFNamespaceSelector } from '@odf/core/redux';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { healthStateMapping } from '@odf/shared/dashboards/status-card/states';
 import {
   useCustomPrometheusPoll,
@@ -11,11 +10,8 @@ import { Kebab } from '@odf/shared/kebab/kebab';
 import { ModalKeys } from '@odf/shared/modals/types';
 import { StorageClassModel } from '@odf/shared/models';
 import { ResourceIcon } from '@odf/shared/resource-link/resource-link';
-import {
-  K8sResourceKind,
-  StorageClassResourceKind,
-  CephClusterKind,
-} from '@odf/shared/types';
+import { getNamespace } from '@odf/shared/selectors';
+import { K8sResourceKind, StorageClassResourceKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import {
   humanizeBinaryBytes,
@@ -35,15 +31,16 @@ import {
   WatchK8sResults,
   useListPageFilter,
   VirtualizedTable,
+  useK8sWatchResources,
 } from '@openshift-console/dynamic-plugin-sdk';
 import Status from '@openshift-console/dynamic-plugin-sdk/lib/app/components/status/Status';
 import classNames from 'classnames';
-import { Link, useLocation } from 'react-router-dom';
+import { Link, useLocation, useParams } from 'react-router-dom';
 import { Tooltip } from '@patternfly/react-core';
 import { sortable, wrappable } from '@patternfly/react-table';
-import { CephBlockPoolModel, CephClusterModel } from '../models';
+import { CephBlockPoolModel } from '../models';
 import { getPoolQuery, StorageDashboardQuery } from '../queries';
-import { StoragePoolKind } from '../types';
+import { StoragePoolKind, ODFSystemParams } from '../types';
 import {
   disableMenuAction,
   getPerPoolMetrics,
@@ -216,7 +213,6 @@ type CustomData = {
   };
   storageClasses: StorageClassResourceKind[];
   listPagePath: string;
-  cephCluster: CephClusterKind;
 };
 
 const RowRenderer: React.FC<RowProps<StoragePoolKind, CustomData>> = ({
@@ -226,13 +222,15 @@ const RowRenderer: React.FC<RowProps<StoragePoolKind, CustomData>> = ({
 }) => {
   const { t } = useCustomTranslation();
 
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const isExternalSS = systemFlags[getNamespace(obj)]?.isExternalMode;
+
   const {
     poolRawCapacity,
     poolCompressionSavings,
     storageClasses,
     listPagePath,
-    cephCluster,
-  } = rowData;
+  }: CustomData = rowData;
 
   const { name } = obj.metadata;
   const replica = obj.spec?.replicated?.size;
@@ -249,7 +247,6 @@ const RowRenderer: React.FC<RowProps<StoragePoolKind, CustomData>> = ({
     !!compressionMode && compressionMode !== 'none';
   const phase = obj?.status?.phase;
 
-  // Hooks
   const poolScNames: string[] = React.useMemo(
     () => getScNamesUsingPool(storageClasses, name),
     [name, storageClasses]
@@ -258,7 +255,6 @@ const RowRenderer: React.FC<RowProps<StoragePoolKind, CustomData>> = ({
   // Details page link
   const to = `${listPagePath}/${name}`;
 
-  // Metrics
   // {poolRawCapacity: {"pool-1" : size_bytes, "pool-2" : size_bytes, ...}}
   const rawCapacity: string = poolRawCapacity?.[name]
     ? humanizeBinaryBytes(poolRawCapacity?.[name])?.string
@@ -320,7 +316,7 @@ const RowRenderer: React.FC<RowProps<StoragePoolKind, CustomData>> = ({
           >
             <Kebab
               extraProps={{ resource: obj, resourceModel: CephBlockPoolModel }}
-              isDisabled={disableMenuAction(obj, cephCluster)}
+              isDisabled={disableMenuAction(obj, isExternalSS)}
               customKebabItems={[
                 {
                   key: ModalKeys.EDIT_RES,
@@ -342,7 +338,7 @@ const RowRenderer: React.FC<RowProps<StoragePoolKind, CustomData>> = ({
         ) : (
           <Kebab
             extraProps={{ resource: obj, resourceModel: CephBlockPoolModel }}
-            isDisabled={disableMenuAction(obj, cephCluster)}
+            isDisabled={disableMenuAction(obj, isExternalSS)}
             customKebabItems={[
               {
                 key: ModalKeys.EDIT_RES,
@@ -375,13 +371,7 @@ type BlockPoolListPageProps = {
   hideColumnManagement?: boolean;
 };
 
-const resources = (ns: string) => ({
-  ceph: {
-    kind: referenceForModel(CephClusterModel),
-    namespaced: true,
-    namespace: ns,
-    isList: true,
-  },
+const resources = {
   sc: {
     kind: StorageClassModel.kind,
     namespaced: false,
@@ -391,31 +381,28 @@ const resources = (ns: string) => ({
     kind: referenceForModel(CephBlockPoolModel),
     isList: true,
   },
-});
+};
 
 type WatchType = {
   sc: StorageClassResourceKind[];
-  ceph: K8sResourceKind[];
   blockPools: StoragePoolKind[];
 };
 
 export const BlockPoolListPage: React.FC<BlockPoolListPageProps> = ({}) => {
   const { t } = useCustomTranslation();
 
-  const { odfNamespace, isODFNsLoaded, odfNsLoadError, isNsSafe } =
-    useODFNamespaceSelector();
-
   const location = useLocation();
   const listPagePath: string = location.pathname;
 
-  const response = useSafeK8sWatchResources(
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags, areFlagsLoaded, flagsLoadError } =
+    useODFSystemFlagsSelector();
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
+
+  const response = useK8sWatchResources(
     resources
   ) as WatchK8sResults<WatchType>;
 
-  const cephClusters = response.ceph.data;
-  const cephLoaded = response.ceph.loaded;
-  const cephError = response.ceph.loadError;
-
   const storageClasses = response.sc.data;
   const scLoaded = response.sc.loaded;
   const scError = response.sc.loadError;
@@ -429,26 +416,23 @@ export const BlockPoolListPage: React.FC<BlockPoolListPageProps> = ({}) => {
     true
   );
   const poolNames: string[] = blockPools.map((pool) => pool.metadata?.name);
-  const memoizedPoolNames = useDeepCompareMemoize(poolNames, true);
 
-  // Metrics
   const [poolRawCapacityMetrics, rawCapLoadError, rawCapLoading] =
     useCustomPrometheusPoll(
       getValidPrometheusPollObj(
         {
           endpoint: 'api/v1/query' as any,
           query: getPoolQuery(
-            memoizedPoolNames,
-            StorageDashboardQuery.POOL_RAW_CAPACITY_USED
+            poolNames,
+            StorageDashboardQuery.POOL_RAW_CAPACITY_USED,
+            managedByOCS
           ),
-          namespace: odfNamespace,
           basePath: usePrometheusBasePath(),
         },
-        isNsSafe
+        !!poolNames?.length
       )
     );
 
-  // compression queries
   const [compressionSavings, compressionLoadError, compressionLoading] =
     useCustomPrometheusPoll(
       getValidPrometheusPollObj(
@@ -456,12 +440,12 @@ export const BlockPoolListPage: React.FC<BlockPoolListPageProps> = ({}) => {
           endpoint: 'api/v1/query' as any,
           query: getPoolQuery(
             poolNames,
-            StorageDashboardQuery.POOL_COMPRESSION_SAVINGS
+            StorageDashboardQuery.POOL_COMPRESSION_SAVINGS,
+            managedByOCS
           ),
-          namespace: odfNamespace,
           basePath: usePrometheusBasePath(),
         },
-        isNsSafe
+        !!poolNames?.length
       )
     );
 
@@ -478,13 +462,11 @@ export const BlockPoolListPage: React.FC<BlockPoolListPageProps> = ({}) => {
     );
     return {
       storageClasses: memoizedSC ?? [],
-      cephCluster: cephClusters?.[0],
       poolRawCapacity,
       poolCompressionSavings,
       listPagePath,
     };
   }, [
-    cephClusters,
     compressionLoadError,
     compressionLoading,
     compressionSavings,
@@ -497,9 +479,9 @@ export const BlockPoolListPage: React.FC<BlockPoolListPageProps> = ({}) => {
 
   const loaded =
     blockPoolsLoaded &&
-    (cephLoaded || scLoaded || !compressionLoading || !rawCapLoading);
+    (areFlagsLoaded || scLoaded || !compressionLoading || !rawCapLoading);
   const error =
-    cephError ||
+    flagsLoadError ||
     scError ||
     blockPoolsError ||
     compressionLoadError ||
@@ -518,15 +500,15 @@ export const BlockPoolListPage: React.FC<BlockPoolListPageProps> = ({}) => {
       <ListPageBody>
         <ListPageFilter
           data={data}
-          loaded={loaded && isODFNsLoaded}
+          loaded={loaded}
           onFilterChange={onFilterChange}
           hideColumnManagement={true}
         />
         <BlockPoolList
           data={filteredData}
           unfilteredData={data}
-          loaded={loaded && isODFNsLoaded}
-          loadError={error || odfNsLoadError}
+          loaded={loaded}
+          loadError={error}
           rowData={{ ...customData }}
         />
       </ListPageBody>
diff --git a/packages/ocs/block-pool/CreateBlockPool.tsx b/packages/ocs/block-pool/CreateBlockPool.tsx
index 820d8ec2f..930089295 100644
--- a/packages/ocs/block-pool/CreateBlockPool.tsx
+++ b/packages/ocs/block-pool/CreateBlockPool.tsx
@@ -1,24 +1,21 @@
 import * as React from 'react';
-import { useSafeK8sWatchResource } from '@odf/core/hooks';
-import { useODFNamespaceSelector } from '@odf/core/redux';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
+import { getResourceInNs as getCephClusterInNs } from '@odf/core/utils';
 import { StatusBox } from '@odf/shared/generic/status-box';
-import { useDeepCompareMemoize } from '@odf/shared/hooks/deep-compare-memoize';
 import { CephClusterKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { referenceForModel } from '@odf/shared/utils';
 import {
   getAPIVersionForModel,
   k8sCreate,
+  useK8sWatchResource,
 } from '@openshift-console/dynamic-plugin-sdk';
 import { match, useHistory } from 'react-router';
+import { useParams } from 'react-router-dom';
 import { Button, Modal } from '@patternfly/react-core';
-import {
-  CEPH_EXTERNAL_CR_NAME,
-  COMPRESSION_ON,
-  POOL_STATE,
-} from '../constants';
+import { COMPRESSION_ON, POOL_STATE } from '../constants';
 import { CephBlockPoolModel, CephClusterModel } from '../models';
-import { StoragePoolKind } from '../types';
+import { StoragePoolKind, ODFSystemParams } from '../types';
 import { getErrorMessage } from '../utils';
 import { BlockPoolBody } from './body';
 import { BlockPoolFooter } from './footer';
@@ -53,11 +50,10 @@ export const getPoolKindObj = (
   },
 });
 
-export const cephClusterResource = (ns: string) => ({
+export const cephClusterResource = {
   kind: referenceForModel(CephClusterModel),
-  namespace: ns,
   isList: true,
-});
+};
 
 const CreateBlockPool: React.FC<CreateBlockPoolProps> = ({
   match: blockPoolMatch,
@@ -66,21 +62,24 @@ const CreateBlockPool: React.FC<CreateBlockPoolProps> = ({
   const { t } = useCustomTranslation();
 
   const history = useHistory();
+  const { namespace: poolNs } = useParams<ODFSystemParams>();
 
   const [state, dispatch] = React.useReducer(
     blockPoolReducer,
     blockPoolInitialState
   );
-  const [cephClusters, isLoaded, loadError] =
-    useSafeK8sWatchResource<CephClusterKind[]>(cephClusterResource);
 
-  const cephCluster: CephClusterKind = useDeepCompareMemoize(
-    cephClusters[0],
-    true
-  );
+  const [cephClusters, isLoaded, loadError] =
+    useK8sWatchResource<CephClusterKind[]>(cephClusterResource);
+  // only single cluster per Namespace
+  const cephCluster = getCephClusterInNs(
+    cephClusters,
+    poolNs
+  ) as CephClusterKind;
 
-  const { odfNamespace, isODFNsLoaded, odfNsLoadError } =
-    useODFNamespaceSelector();
+  const { systemFlags, areFlagsLoaded, flagsLoadError } =
+    useODFSystemFlagsSelector();
+  const isExternalSS = systemFlags[poolNs]?.isExternalMode;
 
   // OCS create pool page url ends with ~new, ODF create pool page ends with /create/~new
   const blockPoolPageUrl = params?.appName
@@ -94,7 +93,7 @@ const CreateBlockPool: React.FC<CreateBlockPoolProps> = ({
   // Create new pool
   const createPool = () => {
     if (cephCluster?.status?.phase === POOL_STATE.READY) {
-      const poolObj: StoragePoolKind = getPoolKindObj(state, odfNamespace);
+      const poolObj: StoragePoolKind = getPoolKindObj(state, poolNs);
 
       dispatch({ type: BlockPoolActionType.SET_INPROGRESS, payload: true });
       k8sCreate({ model: CephBlockPoolModel, data: poolObj })
@@ -118,7 +117,7 @@ const CreateBlockPool: React.FC<CreateBlockPoolProps> = ({
       });
   };
 
-  if (cephCluster?.metadata.name === CEPH_EXTERNAL_CR_NAME) {
+  if (isExternalSS) {
     return (
       <Modal
         title={t('Create BlockPool')}
@@ -154,7 +153,7 @@ const CreateBlockPool: React.FC<CreateBlockPoolProps> = ({
         </p>
       </div>
       <div className="ceph-create-block-pool__form">
-        {isLoaded && isODFNsLoaded && !loadError && !odfNsLoadError ? (
+        {isLoaded && areFlagsLoaded && !loadError && !flagsLoadError ? (
           <>
             <BlockPoolBody
               cephCluster={cephCluster}
@@ -170,8 +169,8 @@ const CreateBlockPool: React.FC<CreateBlockPoolProps> = ({
           </>
         ) : (
           <StatusBox
-            loadError={loadError || odfNsLoadError}
-            loaded={isLoaded && isODFNsLoaded}
+            loadError={loadError || flagsLoadError}
+            loaded={isLoaded && areFlagsLoaded}
             label={t('BlockPool Creation Form')}
           />
         )}
diff --git a/packages/ocs/block-pool/body.tsx b/packages/ocs/block-pool/body.tsx
index 76be1d64f..f4b1f63b6 100644
--- a/packages/ocs/block-pool/body.tsx
+++ b/packages/ocs/block-pool/body.tsx
@@ -1,12 +1,12 @@
 import * as React from 'react';
-import { useSafeK8sGet, useSafeK8sList } from '@odf/core/hooks';
 import { checkArbiterCluster } from '@odf/core/utils';
 import {
   fieldRequirementsTranslations,
   formSettings,
 } from '@odf/shared/constants';
+import { useK8sGet, useK8sList } from '@odf/shared/hooks';
 import { TextInputWithFieldRequirements } from '@odf/shared/input-with-requirements';
-import { getName } from '@odf/shared/selectors';
+import { getName, getNamespace } from '@odf/shared/selectors';
 import {
   ListKind,
   StorageClusterKind,
@@ -72,12 +72,14 @@ export const BlockPoolBody = (props: BlockPoolBodyPros) => {
   const { cephCluster, state, dispatch, showPoolStatus, isUpdate } = props;
   const { t } = useCustomTranslation();
 
+  const poolNs = getNamespace(cephCluster);
+
   const [storageCluster, storageClusterLoaded, storageClusterLoadError] =
-    useSafeK8sGet<ListKind<StorageClusterKind>>(StorageClusterModel, null);
+    useK8sGet<ListKind<StorageClusterKind>>(StorageClusterModel, null, poolNs);
 
   const [isReplicaOpen, setReplicaOpen] = React.useState(false);
 
-  const [data, loaded, loadError] = useSafeK8sList(CephBlockPoolModel);
+  const [data, loaded, loadError] = useK8sList(CephBlockPoolModel, poolNs);
 
   const { schema, fieldRequirements } = React.useMemo(() => {
     const existingNames =
diff --git a/packages/ocs/constants/common.ts b/packages/ocs/constants/common.ts
index b0ecce9c7..94545be5d 100644
--- a/packages/ocs/constants/common.ts
+++ b/packages/ocs/constants/common.ts
@@ -2,7 +2,6 @@ export const PVC_PROVISIONER_ANNOTATION =
   'volume.beta.kubernetes.io/storage-provisioner';
 export const OCS_OPERATOR = 'ocs-operator';
 export const COMPRESSION_ON = 'aggressive';
-export const CEPH_EXTERNAL_CR_NAME = 'ocs-external-storagecluster-cephcluster';
 
 export enum POOL_STATE {
   READY = 'Ready',
@@ -34,8 +33,6 @@ export enum CLUSTER_STATUS {
   PROGRESSING = 'Progressing',
 }
 
-export const CEPH_INTERNAL_CR_NAME = 'ocs-storagecluster-cephcluster';
-
 export const CLUSTER_ID = 'clusterID';
 export const PROV_SECRET_NS = 'csi.storage.k8s.io/provisioner-secret-namespace';
 export const NODE_SECRET_NS = 'csi.storage.k8s.io/node-stage-secret-namespace';
diff --git a/packages/ocs/dashboards/block-pool/compression-details-card.tsx b/packages/ocs/dashboards/block-pool/compression-details-card.tsx
index 9576a4a97..f9bc683cb 100644
--- a/packages/ocs/dashboards/block-pool/compression-details-card.tsx
+++ b/packages/ocs/dashboards/block-pool/compression-details-card.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { EfficiencyItemBody } from '@odf/shared/dashboards/storage-efficiency/storage-efficiency-card-item';
 import {
   useCustomPrometheusPoll,
@@ -13,8 +14,10 @@ import {
 } from '@odf/shared/utils';
 import { DetailsBody } from '@openshift-console/dynamic-plugin-sdk-internal';
 import { OverviewDetailItem as DetailItem } from '@openshift-console/plugin-shared';
+import { useParams } from 'react-router-dom';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
 import { getPoolQuery, StorageDashboardQuery } from '../../queries';
+import { ODFSystemParams } from '../../types';
 import { getPerPoolMetrics, PoolMetrics } from '../../utils';
 import { BlockPoolDashboardContext } from './block-pool-dashboard-context';
 
@@ -22,18 +25,33 @@ export const CompressionDetailsCard: React.FC = () => {
   const { t } = useCustomTranslation();
   const { obj } = React.useContext(BlockPoolDashboardContext);
 
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
+
   const compressionMode = obj.spec?.compressionMode;
   const compressionEnabled = !!compressionMode && compressionMode !== 'none';
   const { name } = obj.metadata;
 
-  // Compression Metrics
   const queries = React.useMemo(
     () => [
-      getPoolQuery([name], StorageDashboardQuery.POOL_COMPRESSION_SAVINGS),
-      getPoolQuery([name], StorageDashboardQuery.POOL_COMPRESSION_ELIGIBILITY),
-      getPoolQuery([name], StorageDashboardQuery.POOL_COMPRESSION_RATIO),
+      getPoolQuery(
+        [name],
+        StorageDashboardQuery.POOL_COMPRESSION_SAVINGS,
+        managedByOCS
+      ),
+      getPoolQuery(
+        [name],
+        StorageDashboardQuery.POOL_COMPRESSION_ELIGIBILITY,
+        managedByOCS
+      ),
+      getPoolQuery(
+        [name],
+        StorageDashboardQuery.POOL_COMPRESSION_RATIO,
+        managedByOCS
+      ),
     ],
-    [name]
+    [name, managedByOCS]
   );
 
   const [poolCompressionSavings, savingsError, savingsLoading] =
diff --git a/packages/ocs/dashboards/block-pool/inventory-card.tsx b/packages/ocs/dashboards/block-pool/inventory-card.tsx
index 568ee758a..fa6e487b3 100644
--- a/packages/ocs/dashboards/block-pool/inventory-card.tsx
+++ b/packages/ocs/dashboards/block-pool/inventory-card.tsx
@@ -32,7 +32,6 @@ export const InventoryCard: React.FC = () => {
   const { obj } = React.useContext(BlockPoolDashboardContext);
   const { name } = obj.metadata;
 
-  // Hooks
   const [scResources, scLoaded, scLoadError] =
     useK8sWatchResource<StorageClassResourceKind[]>(scResource);
   const [pvcResources, pvcLoaded, pvcLoadError] =
diff --git a/packages/ocs/dashboards/block-pool/raw-capacity-card.tsx b/packages/ocs/dashboards/block-pool/raw-capacity-card.tsx
index 75c25ebe1..77f4c1564 100644
--- a/packages/ocs/dashboards/block-pool/raw-capacity-card.tsx
+++ b/packages/ocs/dashboards/block-pool/raw-capacity-card.tsx
@@ -1,11 +1,14 @@
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import {
   useCustomPrometheusPoll,
   usePrometheusBasePath,
 } from '@odf/shared/hooks/custom-prometheus-poll';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { getInstantVectorStats } from '@odf/shared/utils';
+import { useParams } from 'react-router-dom';
 import { getPoolQuery, StorageDashboardQuery } from '../../queries';
+import { ODFSystemParams } from '../../types';
 import {
   CapacityCard,
   CapacityCardProps,
@@ -17,13 +20,24 @@ export const RawCapacityCard: React.FC = () => {
   const { obj } = React.useContext(BlockPoolDashboardContext);
   const { name } = obj.metadata;
 
-  // Metrics
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
+
   const queries = React.useMemo(
     () => [
-      getPoolQuery([name], StorageDashboardQuery.POOL_RAW_CAPACITY_USED),
-      getPoolQuery([name], StorageDashboardQuery.POOL_MAX_CAPACITY_AVAILABLE),
+      getPoolQuery(
+        [name],
+        StorageDashboardQuery.POOL_RAW_CAPACITY_USED,
+        managedByOCS
+      ),
+      getPoolQuery(
+        [name],
+        StorageDashboardQuery.POOL_MAX_CAPACITY_AVAILABLE,
+        managedByOCS
+      ),
     ],
-    [name]
+    [name, managedByOCS]
   );
 
   const [usedCapacityData, usedCapacityLoading, usedCapacityLoadError] =
diff --git a/packages/ocs/dashboards/block-pool/utilization-card.tsx b/packages/ocs/dashboards/block-pool/utilization-card.tsx
index b1efb0b95..73323761f 100644
--- a/packages/ocs/dashboards/block-pool/utilization-card.tsx
+++ b/packages/ocs/dashboards/block-pool/utilization-card.tsx
@@ -1,8 +1,10 @@
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { PrometheusUtilizationItem } from '@odf/shared/dashboards/utilization-card/prometheus-utilization-item';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { humanizeDecimalBytesPerSec } from '@odf/shared/utils';
 import { UtilizationDurationDropdown } from '@openshift-console/dynamic-plugin-sdk-internal';
+import { useParams } from 'react-router-dom';
 import {
   Grid,
   Card,
@@ -11,6 +13,7 @@ import {
   CardTitle,
 } from '@patternfly/react-core';
 import { getPoolQuery, StorageDashboardQuery } from '../../queries';
+import { ODFSystemParams } from '../../types';
 import { humanizeIOPS } from '../persistent-internal/utilization-card/utils';
 import { BlockPoolDashboardContext } from './block-pool-dashboard-context';
 
@@ -19,6 +22,10 @@ export const UtilizationCard: React.FC = () => {
   const { obj } = React.useContext(BlockPoolDashboardContext);
   const { name } = obj.metadata;
 
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
+
   return (
     <Card>
       <CardHeader>
@@ -32,7 +39,8 @@ export const UtilizationCard: React.FC = () => {
           title={t('IOPS')}
           utilizationQuery={getPoolQuery(
             [name],
-            StorageDashboardQuery.POOL_UTILIZATION_IOPS_QUERY
+            StorageDashboardQuery.POOL_UTILIZATION_IOPS_QUERY,
+            managedByOCS
           )}
           humanizeValue={humanizeIOPS}
         />
@@ -40,7 +48,8 @@ export const UtilizationCard: React.FC = () => {
           title={t('Throughput')}
           utilizationQuery={getPoolQuery(
             [name],
-            StorageDashboardQuery.POOL_UTILIZATION_THROUGHPUT_QUERY
+            StorageDashboardQuery.POOL_UTILIZATION_THROUGHPUT_QUERY,
+            managedByOCS
           )}
           humanizeValue={humanizeDecimalBytesPerSec}
         />
diff --git a/packages/ocs/dashboards/network-file-system/status-card/status-card.tsx b/packages/ocs/dashboards/network-file-system/status-card/status-card.tsx
index 94842a86b..3ada7018e 100644
--- a/packages/ocs/dashboards/network-file-system/status-card/status-card.tsx
+++ b/packages/ocs/dashboards/network-file-system/status-card/status-card.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { useSafeK8sWatchResource } from '@odf/core/hooks';
-import { K8sResourceObj } from '@odf/core/types';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import HealthItem from '@odf/shared/dashboards/status-card/HealthItem';
 import { PodModel } from '@odf/shared/models';
 import { PodKind } from '@odf/shared/types';
@@ -10,24 +9,32 @@ import {
   getPodStatus,
   getPodHealthState,
 } from '@odf/shared/utils';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
+import { useParams } from 'react-router-dom';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
+import { ODFSystemParams } from '../../../types';
 
-const nfsPodResource: K8sResourceObj = (ns) => ({
+const nfsPodResource = (clusterNs: string, clusterName: string) => ({
   isList: true,
   kind: referenceForModel(PodModel),
-  namespace: ns,
+  namespace: clusterNs,
   selector: {
     matchLabels: {
       app: 'rook-ceph-nfs',
-      ceph_nfs: 'ocs-storagecluster-cephnfs',
+      ceph_nfs: `${clusterName}-cephnfs`,
     },
   },
 });
 
 export const StatusCard: React.FC = () => {
   const { t } = useCustomTranslation();
-  const [nfsPods, nfsPodsLoaded, nfsPodsLoadError] =
-    useSafeK8sWatchResource<PodKind[]>(nfsPodResource);
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const clusterName = systemFlags[clusterNs]?.ocsClusterName;
+
+  const [nfsPods, nfsPodsLoaded, nfsPodsLoadError] = useK8sWatchResource<
+    PodKind[]
+  >(nfsPodResource(clusterNs, clusterName));
 
   const serverHealthState = getPodHealthState(
     getPodStatus(nfsPods?.[0]),
diff --git a/packages/ocs/dashboards/object-service/activity-card/activity-card.tsx b/packages/ocs/dashboards/object-service/activity-card/activity-card.tsx
index 78ce50305..69864832d 100644
--- a/packages/ocs/dashboards/object-service/activity-card/activity-card.tsx
+++ b/packages/ocs/dashboards/object-service/activity-card/activity-card.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { RGW_FLAG } from '@odf/core/features';
-import { useSafeK8sWatchResource } from '@odf/core/hooks';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
+import { odfSystemFlagsPayload } from '@odf/core/redux/actions';
 import { secretResource } from '@odf/core/resources';
 import {
   useCustomPrometheusPoll,
@@ -10,50 +10,63 @@ import { EventModel } from '@odf/shared/models';
 import { K8sResourceKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { getResiliencyProgress } from '@odf/shared/utils';
-import {
-  useK8sWatchResource,
-  useFlag,
-} from '@openshift-console/dynamic-plugin-sdk';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import {
   ActivityBody,
   RecentEventsBody,
   OngoingActivityBody,
 } from '@openshift-console/dynamic-plugin-sdk-internal';
 import { EventKind } from '@openshift-console/dynamic-plugin-sdk-internal/lib/api/internal-types';
+import { useParams } from 'react-router-dom';
 import { Card, CardHeader, CardTitle } from '@patternfly/react-core';
 import {
   dataResiliencyQueryMap,
   ObjectServiceDashboardQuery,
 } from '../../../queries';
+import { ODFSystemParams } from '../../../types';
 import { isObjectStorageEvent, decodeRGWPrefix } from '../../../utils';
 import './activity-card.scss';
 
 const eventsResource = { isList: true, kind: EventModel.kind };
 
-const RecentEvent: React.FC = () => {
+type ActivityProps = {
+  systemFlags: odfSystemFlagsPayload['systemFlags'];
+  clusterNs: string;
+};
+
+const RecentEvent: React.FC<ActivityProps> = ({ systemFlags, clusterNs }) => {
+  const isRGWSupported = systemFlags[clusterNs]?.isRGWAvailable;
+  const isMCGSupported = systemFlags[clusterNs]?.isNoobaaAvailable;
+
   const [data, loaded, loadError] =
     useK8sWatchResource<EventKind[]>(eventsResource);
   return (
     <RecentEventsBody
       events={{ data, loaded, loadError }}
-      filter={isObjectStorageEvent}
+      filter={isObjectStorageEvent(isRGWSupported, isMCGSupported)}
     />
   );
 };
 
-const OngoingActivity: React.FC = () => {
-  const [data, loaded, loadError] =
-    useSafeK8sWatchResource<K8sResourceKind>(secretResource);
-  const isRGWSupported = useFlag(RGW_FLAG);
+const OngoingActivity: React.FC<ActivityProps> = ({
+  systemFlags,
+  clusterNs,
+}) => {
+  const isRGWSupported = systemFlags[clusterNs]?.isRGWAvailable;
+  const isMCGSupported = systemFlags[clusterNs]?.isNoobaaAvailable;
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
+
+  const [data, loaded, loadError] = useK8sWatchResource<K8sResourceKind>(
+    secretResource(clusterNs)
+  );
 
   const rgwPrefix = React.useMemo(
     () => (isRGWSupported && loaded && !loadError ? decodeRGWPrefix(data) : ''),
     [data, loaded, loadError, isRGWSupported]
   );
-  const rgwResiliencyQuery =
-    dataResiliencyQueryMap[
-      ObjectServiceDashboardQuery.RGW_REBUILD_PROGRESS_QUERY
-    ](rgwPrefix);
+  const rgwResiliencyQuery = dataResiliencyQueryMap[
+    ObjectServiceDashboardQuery.RGW_REBUILD_PROGRESS_QUERY
+  ](rgwPrefix, managedByOCS);
 
   const [progress, progressError] = useCustomPrometheusPoll({
     query: dataResiliencyQueryMap.MCG_REBUILD_PROGRESS_QUERY,
@@ -73,7 +86,7 @@ const OngoingActivity: React.FC = () => {
 
   const prometheusActivities = [];
 
-  if (getResiliencyProgress(progress) < 1) {
+  if (isMCGSupported && getResiliencyProgress(progress) < 1) {
     prometheusActivities.push({
       results: [progress, eta],
       loader: () =>
@@ -96,7 +109,7 @@ const OngoingActivity: React.FC = () => {
   return (
     <OngoingActivityBody
       loaded={
-        (progress || progressError) &&
+        (isMCGSupported ? progress || progressError : true) &&
         (isRGWSupported ? rgwProgress || rgwProgressError : true)
       }
       prometheusActivities={prometheusActivities}
@@ -107,14 +120,17 @@ const OngoingActivity: React.FC = () => {
 const ActivityCard: React.FC = () => {
   const { t } = useCustomTranslation();
 
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+
   return (
     <Card className="co-overview-card--gradient">
       <CardHeader>
         <CardTitle>{t('Activity')}</CardTitle>
       </CardHeader>
       <ActivityBody className="nb-activity-card__body">
-        <OngoingActivity />
-        <RecentEvent />
+        <OngoingActivity systemFlags={systemFlags} clusterNs={clusterNs} />
+        <RecentEvent systemFlags={systemFlags} clusterNs={clusterNs} />
       </ActivityBody>
     </Card>
   );
diff --git a/packages/ocs/dashboards/object-service/buckets-card/buckets-card.tsx b/packages/ocs/dashboards/object-service/buckets-card/buckets-card.tsx
index a488cc5cf..5f8690867 100644
--- a/packages/ocs/dashboards/object-service/buckets-card/buckets-card.tsx
+++ b/packages/ocs/dashboards/object-service/buckets-card/buckets-card.tsx
@@ -4,6 +4,7 @@ import {
   NooBaaObjectBucketClaimModel,
   NooBaaObjectBucketModel,
 } from '@odf/core/models';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { FieldLevelHelp } from '@odf/shared/generic/FieldLevelHelp';
 import {
   useCustomPrometheusPoll,
@@ -21,7 +22,9 @@ import {
   InventoryItemBody,
 } from '@openshift-console/dynamic-plugin-sdk';
 import { ResourceInventoryItem } from '@openshift-console/dynamic-plugin-sdk-internal';
+import { useParams } from 'react-router-dom';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
+import { ODFSystemParams } from '../../../types';
 import { BucketsTitle } from './buckets-card-item';
 import { getObcStatusGroups, getObStatusGroups } from './utils';
 import './buckets-card.scss';
@@ -89,15 +92,9 @@ const ObjectInventoryItem: React.FC<ObjectInventoryItemProps> = ({
   );
 };
 
-const ObjectDashboardBucketsCard: React.FC<{}> = () => {
+const ObjectInventoryItem_: React.FC = () => {
   const { t } = useCustomTranslation();
 
-  const [obcData, obcLoaded, obcLoadError] = useK8sWatchResource<
-    K8sResourceKind[]
-  >(objectBucketClaimsResource);
-  const [obData, obLoaded, obLoadError] =
-    useK8sWatchResource<K8sResourceKind[]>(objectBucketResource);
-
   const [noobaaCount, noobaaCountError] = useCustomPrometheusPoll({
     query: BucketsCardQueries.BUCKETS_COUNT,
     endpoint: 'api/v1/query' as any,
@@ -121,6 +118,48 @@ const ObjectDashboardBucketsCard: React.FC<{}> = () => {
     getGaugeValue(unhealthyNoobaaBuckets)
   );
 
+  return (
+    <ObjectInventoryItem
+      isLoading={!(noobaaCount && unhealthyNoobaaBuckets)}
+      error={!!(noobaaCountError || unhealthyNoobaaBucketsError)}
+      title={t('NooBaa Bucket')}
+      count={Number(getGaugeValue(noobaaCount))}
+      TitleComponent={React.useCallback(
+        (props) => (
+          <BucketsTitle
+            objects={noobaaObjectsCount}
+            error={!!noobaaObjectsCountError}
+            {...props}
+          />
+        ),
+        [noobaaObjectsCount, noobaaObjectsCountError]
+      )}
+    >
+      {unhealthyNoobaaBucketsCount > 0 && (
+        <>
+          <RedExclamationCircleIcon />
+          <span className="nb-buckets-card__buckets-failure-status-count">
+            {unhealthyNoobaaBucketsCount}
+          </span>
+        </>
+      )}
+    </ObjectInventoryItem>
+  );
+};
+
+const ObjectDashboardBucketsCard: React.FC<{}> = () => {
+  const { t } = useCustomTranslation();
+
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const isMCGSupported = systemFlags[clusterNs]?.isNoobaaAvailable;
+
+  const [obcData, obcLoaded, obcLoadError] = useK8sWatchResource<
+    K8sResourceKind[]
+  >(objectBucketClaimsResource);
+  const [obData, obLoaded, obLoadError] =
+    useK8sWatchResource<K8sResourceKind[]>(objectBucketResource);
+
   return (
     <Card>
       <CardHeader>
@@ -134,31 +173,7 @@ const ObjectDashboardBucketsCard: React.FC<{}> = () => {
         </CardTitle>
       </CardHeader>
       <CardBody>
-        <ObjectInventoryItem
-          isLoading={!(noobaaCount && unhealthyNoobaaBuckets)}
-          error={!!(noobaaCountError || unhealthyNoobaaBucketsError)}
-          title={t('NooBaa Bucket')}
-          count={Number(getGaugeValue(noobaaCount))}
-          TitleComponent={React.useCallback(
-            (props) => (
-              <BucketsTitle
-                objects={noobaaObjectsCount}
-                error={!!noobaaObjectsCountError}
-                {...props}
-              />
-            ),
-            [noobaaObjectsCount, noobaaObjectsCountError]
-          )}
-        >
-          {unhealthyNoobaaBucketsCount > 0 && (
-            <>
-              <RedExclamationCircleIcon />
-              <span className="nb-buckets-card__buckets-failure-status-count">
-                {unhealthyNoobaaBucketsCount}
-              </span>
-            </>
-          )}
-        </ObjectInventoryItem>
+        {isMCGSupported && <ObjectInventoryItem_ />}
         <ResourceInventoryItem
           isLoading={!obLoaded}
           error={!!obLoadError}
diff --git a/packages/ocs/dashboards/object-service/capacity-breakdown/capacity-breakdown-card.spec.tsx b/packages/ocs/dashboards/object-service/capacity-breakdown/capacity-breakdown-card.spec.tsx
index 8f112f9eb..57a60ec9a 100644
--- a/packages/ocs/dashboards/object-service/capacity-breakdown/capacity-breakdown-card.spec.tsx
+++ b/packages/ocs/dashboards/object-service/capacity-breakdown/capacity-breakdown-card.spec.tsx
@@ -2,6 +2,8 @@ import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import BreakdownCard from './capacity-breakdown-card';
 
+const testNamespace = 'test-ns';
+
 jest.mock('@openshift-console/dynamic-plugin-sdk/lib/extensions', () => {
   const originalModule = jest.requireActual<
     typeof import('@openshift-console/dynamic-plugin-sdk/lib/extensions')
@@ -28,7 +30,16 @@ jest.mock('@odf/core/hooks', () => ({
 }));
 
 jest.mock('@odf/core/redux', () => ({
-  useODFNamespaceSelector: () => ({ odfNamespace: '' }),
+  useODFNamespaceSelector: () => ({ odfNamespace: testNamespace }),
+  useODFSystemFlagsSelector: () => ({
+    systemFlags: {
+      [testNamespace]: { isRGWAvailable: true, isNoobaaAvailable: true },
+    },
+  }),
+}));
+
+jest.mock('react-router-dom', () => ({
+  useParams: () => ({ namespace: testNamespace }),
 }));
 
 describe('Capacity Breakdown Card', () => {
diff --git a/packages/ocs/dashboards/object-service/capacity-breakdown/capacity-breakdown-card.tsx b/packages/ocs/dashboards/object-service/capacity-breakdown/capacity-breakdown-card.tsx
index d7bfed35c..93d2d3321 100644
--- a/packages/ocs/dashboards/object-service/capacity-breakdown/capacity-breakdown-card.tsx
+++ b/packages/ocs/dashboards/object-service/capacity-breakdown/capacity-breakdown-card.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
-import { RGW_FLAG } from '@odf/core/features';
-import { useSafeK8sWatchResource } from '@odf/core/hooks';
 import { useODFNamespaceSelector } from '@odf/core/redux';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { secretResource } from '@odf/core/resources';
 import { BreakdownCardBody } from '@odf/shared/dashboards/breakdown-card/breakdown-body';
 import { LabelPadding } from '@odf/shared/dashboards/breakdown-card/breakdown-chart';
@@ -18,12 +17,10 @@ import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { DataPoint, getInstantVectorStats } from '@odf/shared/utils';
 import { humanizeBinaryBytes, referenceForModel } from '@odf/shared/utils';
 import { isFunctionThenApply } from '@odf/shared/utils';
-import {
-  useK8sWatchResource,
-  useFlag,
-} from '@openshift-console/dynamic-plugin-sdk';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { K8sModel } from '@openshift-console/dynamic-plugin-sdk/lib/api/common-types';
 import * as _ from 'lodash-es';
+import { useParams } from 'react-router-dom';
 import {
   Select,
   SelectGroup,
@@ -40,6 +37,7 @@ import {
   CapacityBreakdown,
 } from '../../../constants';
 import { breakdownQueryMapMCG } from '../../../queries';
+import { ODFSystemParams } from '../../../types';
 import { decodeRGWPrefix, getStackChartStats } from '../../../utils';
 import './capacity-breakdown-card.scss';
 
@@ -295,21 +293,28 @@ const BreakdownCard: React.FC = () => {
   );
   const [isOpenServiceSelect, setServiceSelect] = React.useState(false);
   const [isOpenBreakdownSelect, setBreakdownSelect] = React.useState(false);
-  const isRGWSupported = useFlag(RGW_FLAG);
-  const prevRGWVal = React.useRef(null);
+
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const isRGWSupported = systemFlags[clusterNs]?.isRGWAvailable;
+  const isMCGSupported = systemFlags[clusterNs]?.isNoobaaAvailable;
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
 
   React.useEffect(() => {
-    if (isRGWSupported !== prevRGWVal.current) {
-      prevRGWVal.current = isRGWSupported;
-      if (isRGWSupported) {
-        setServiceType(ServiceType.ALL);
-        setMetricType(CapacityBreakdown.defaultMetrics[ServiceType.ALL]);
-      }
+    if (isRGWSupported && isMCGSupported) {
+      setServiceType(ServiceType.ALL);
+      setMetricType(CapacityBreakdown.defaultMetrics[ServiceType.ALL]);
+    } else if (isMCGSupported) {
+      setServiceType(ServiceType.MCG);
+      setMetricType(CapacityBreakdown.defaultMetrics[ServiceType.MCG]);
+    } else if (isRGWSupported) {
+      setServiceType(ServiceType.RGW);
+      setMetricType(CapacityBreakdown.defaultMetrics[ServiceType.RGW]);
     }
-  }, [isRGWSupported]);
+  }, [isRGWSupported, isMCGSupported]);
 
   const [secretData, secretLoaded, secretLoadError] =
-    useSafeK8sWatchResource<K8sResourceKind>(secretResource);
+    useK8sWatchResource<K8sResourceKind>(secretResource(clusterNs));
   const rgwPrefix = React.useMemo(
     () =>
       isRGWSupported && secretLoaded && !secretLoadError
@@ -328,11 +333,11 @@ const BreakdownCard: React.FC = () => {
       CapacityBreakdown.defaultMetrics[serviceType]
     ];
     return {
-      queries: isFunctionThenApply(q)(rgwPrefix),
+      queries: isFunctionThenApply(q)(rgwPrefix, managedByOCS),
       model: mo,
       metric: me,
     };
-  }, [serviceType, metricType, rgwPrefix]);
+  }, [serviceType, metricType, rgwPrefix, managedByOCS]);
 
   const prometheusQueries = React.useMemo(
     () => Object.values(queries) as string[],
@@ -421,7 +426,7 @@ const BreakdownCard: React.FC = () => {
           </FieldLevelHelp>
         </CardTitle>
         <div className="nb-capacity-breakdown-card__header">
-          {isRGWSupported && (
+          {isRGWSupported && isMCGSupported && (
             <Select
               className="nb-capacity-breakdown-card-header__dropdown nb-capacity-breakdown-card-header__dropdown--margin"
               autoFocus={false}
diff --git a/packages/ocs/dashboards/object-service/data-consumption-card/data-consumption-card-dropdown.tsx b/packages/ocs/dashboards/object-service/data-consumption-card/data-consumption-card-dropdown.tsx
index 2b7a0d7e7..028fc5616 100644
--- a/packages/ocs/dashboards/object-service/data-consumption-card/data-consumption-card-dropdown.tsx
+++ b/packages/ocs/dashboards/object-service/data-consumption-card/data-consumption-card-dropdown.tsx
@@ -32,6 +32,7 @@ export const DataConsumptionDropdown: React.FC<DataConsumptionDropdownProps> = (
     selectedMetric,
     setSelectedMetric,
     isRgwSupported,
+    isMcgSupported,
   } = props;
   const { t } = useCustomTranslation();
   const [isOpenComboDropdown, setComboDropdown] = React.useState(false);
@@ -136,7 +137,7 @@ export const DataConsumptionDropdown: React.FC<DataConsumptionDropdownProps> = (
 
   return (
     <div className="nb-data-consumption-card__dropdown">
-      {isRgwSupported && (
+      {isRgwSupported && isMcgSupported && (
         <Select
           variant={SelectVariant.single}
           className="nb-data-consumption-card__dropdown-item nb-data-consumption-card__dropdown-item--margin"
@@ -188,4 +189,5 @@ type DataConsumptionDropdownProps = {
   selectedMetric: Metrics;
   setSelectedMetric: React.Dispatch<React.SetStateAction<Metrics>>;
   isRgwSupported: boolean;
+  isMcgSupported: boolean;
 };
diff --git a/packages/ocs/dashboards/object-service/data-consumption-card/data-consumption-card.tsx b/packages/ocs/dashboards/object-service/data-consumption-card/data-consumption-card.tsx
index 131f7d3e6..8836ab097 100644
--- a/packages/ocs/dashboards/object-service/data-consumption-card/data-consumption-card.tsx
+++ b/packages/ocs/dashboards/object-service/data-consumption-card/data-consumption-card.tsx
@@ -1,10 +1,11 @@
 import * as React from 'react';
-import { RGW_FLAG } from '@odf/core/features';
 import { useSafeK8sWatchResource } from '@odf/core/hooks';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { K8sResourceObj } from '@odf/core/types';
 import {
   OCS_OPERATOR,
   Breakdown,
+  DataConsumption,
   Metrics,
   ServiceType,
 } from '@odf/ocs/constants';
@@ -21,12 +22,11 @@ import { ClusterServiceVersionKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { DataPoint } from '@odf/shared/utils';
 import { referenceForModel } from '@odf/shared/utils';
-import {
-  PrometheusResponse,
-  useFlag,
-} from '@openshift-console/dynamic-plugin-sdk';
+import { PrometheusResponse } from '@openshift-console/dynamic-plugin-sdk';
 import * as _ from 'lodash-es';
+import { useParams } from 'react-router-dom';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
+import { ODFSystemParams } from '../../../types';
 import { DataConsumptionDropdown } from './data-consumption-card-dropdown';
 import DataConsumptionGraph from './data-consumption-graph';
 import PerformanceGraph from './performance-graph';
@@ -240,7 +240,13 @@ const DataConsumptionCard: React.FC = () => {
   const [breakdownBy, setBreakdownBy] = React.useState(Breakdown.PROVIDERS);
   const [metric, setMetric] = React.useState(Metrics.IOPS);
   const [serviceType, setServiceType] = React.useState(ServiceType.MCG);
-  const RGW = useFlag(RGW_FLAG);
+
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const RGW = systemFlags[clusterNs]?.isRGWAvailable;
+  const MCG = systemFlags[clusterNs]?.isNoobaaAvailable;
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
+
   const [csvList, csvLoaded, csvLoadError] =
     useSafeK8sWatchResource<ClusterServiceVersionKind[]>(csvResource);
   const isOCS45 =
@@ -248,6 +254,14 @@ const DataConsumptionCard: React.FC = () => {
     !csvLoadError &&
     csvList?.find((obj) => _.startsWith(getName(obj), `${OCS_OPERATOR}.v4.5`));
 
+  React.useEffect(() => {
+    if (RGW && !MCG) {
+      setServiceType(ServiceType.RGW);
+      setMetric(DataConsumption.defaultMetrics[ServiceType.RGW]);
+      setBreakdownBy(null);
+    }
+  }, [RGW, MCG]);
+
   const queries: string[] = React.useMemo(() => {
     return serviceType === ServiceType.MCG
       ? Object.values(
@@ -255,10 +269,10 @@ const DataConsumptionCard: React.FC = () => {
             DATA_CONSUMPTION_QUERIES[ServiceType.MCG][breakdownBy][Metrics.IOPS]
         )
       : Object.values(
-          DATA_CONSUMPTION_QUERIES[ServiceType.RGW][metric] ??
+          DATA_CONSUMPTION_QUERIES[ServiceType.RGW](managedByOCS)[metric] ??
             DATA_CONSUMPTION_QUERIES[ServiceType.MCG][Metrics.BANDWIDTH]
         );
-  }, [breakdownBy, metric, serviceType]);
+  }, [breakdownBy, metric, serviceType, managedByOCS]);
 
   return (
     <Card>
@@ -279,6 +293,7 @@ const DataConsumptionCard: React.FC = () => {
           selectedMetric={metric}
           setSelectedMetric={setMetric}
           isRgwSupported={RGW && !isOCS45}
+          isMcgSupported={MCG}
         />
       </CardHeader>
       <CardBody>
diff --git a/packages/ocs/dashboards/object-service/details-card/details-card.tsx b/packages/ocs/dashboards/object-service/details-card/details-card.tsx
index 22c40bddf..aec6bbf6c 100644
--- a/packages/ocs/dashboards/object-service/details-card/details-card.tsx
+++ b/packages/ocs/dashboards/object-service/details-card/details-card.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { OCS_OPERATOR } from '@odf/core/constants';
 import { ODF_MODEL_FLAG } from '@odf/core/features';
-import { RGW_FLAG } from '@odf/core/features';
 import { useODFNamespaceSelector } from '@odf/core/redux';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { getOperatorVersion } from '@odf/core/utils';
 import { ODF_OPERATOR } from '@odf/shared/constants';
 import {
@@ -24,8 +24,9 @@ import { getMetric } from '@odf/shared/utils';
 import { useFlag } from '@openshift-console/dynamic-plugin-sdk';
 import { DetailsBody } from '@openshift-console/dynamic-plugin-sdk-internal';
 import { OverviewDetailItem as DetailItem } from '@openshift-console/plugin-shared';
-import { Link } from 'react-router-dom';
+import { Link, useParams } from 'react-router-dom';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
+import { ODFSystemParams } from '../../../types';
 import './details-card.scss';
 
 const NOOBAA_SYSTEM_NAME_QUERY = 'NooBaa_system_info';
@@ -70,12 +71,17 @@ export const ObjectServiceDetailsCard: React.FC<{}> = () => {
     ? t('Data Foundation')
     : t('OpenShift Container Storage');
 
-  const hasRGW = useFlag(RGW_FLAG);
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const hasRGW = systemFlags[clusterNs]?.isRGWAvailable;
+  const hasMCG = systemFlags[clusterNs]?.isNoobaaAvailable;
+
   const servicePath = `${resourcePathFromModel(
     ClusterServiceVersionModel,
     getName(csv),
     odfNamespace
   )}`;
+
   return (
     <Card>
       <CardHeader>
@@ -101,9 +107,11 @@ export const ObjectServiceDetailsCard: React.FC<{}> = () => {
             }
             error={systemLoadError || dashboardLinkLoadError}
           >
-            <p data-test-id="system-name-mcg">
-              {t('Multicloud Object Gateway')}
-            </p>
+            {hasMCG && (
+              <p data-test-id="system-name-mcg">
+                {t('Multicloud Object Gateway')}
+              </p>
+            )}
             {hasRGW && (
               <p
                 className="ceph-details-card__rgw-system-name--margin"
diff --git a/packages/ocs/dashboards/object-service/resource-providers-card/resource-providers-card.tsx b/packages/ocs/dashboards/object-service/resource-providers-card/resource-providers-card.tsx
index a02b88b2f..6d12f490d 100644
--- a/packages/ocs/dashboards/object-service/resource-providers-card/resource-providers-card.tsx
+++ b/packages/ocs/dashboards/object-service/resource-providers-card/resource-providers-card.tsx
@@ -1,4 +1,6 @@
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
+import { DataUnavailableError } from '@odf/shared/generic';
 import { FieldLevelHelp } from '@odf/shared/generic/FieldLevelHelp';
 import {
   useCustomPrometheusPoll,
@@ -8,7 +10,9 @@ import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { getMetric } from '@odf/shared/utils';
 import { PrometheusResponse } from '@openshift-console/dynamic-plugin-sdk';
 import * as _ from 'lodash-es';
+import { useParams } from 'react-router-dom';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
+import { ODFSystemParams } from '../../../types';
 import { ResourceProvidersBody } from './resource-providers-card-body';
 import {
   ResourceProvidersItem,
@@ -41,9 +45,7 @@ const createProvidersList = (data: PrometheusResponse): ProviderType => {
   return providersList;
 };
 
-const ResourceProviders: React.FC<{}> = () => {
-  const { t } = useCustomTranslation();
-
+const ResourceProvidersBody_: React.FC = () => {
   const [providersTypesQueryResult, providersTypesQueryResultError] =
     useCustomPrometheusPoll({
       query: RESOURCE_PROVIDERS_QUERY.PROVIDERS_TYPES,
@@ -79,6 +81,35 @@ const ResourceProviders: React.FC<{}> = () => {
 
   const providerTypes = filterProviders(allProviders);
 
+  return (
+    <ResourceProvidersBody
+      isLoading={
+        !error &&
+        !(providersTypesQueryResult && unhealthyProvidersTypesQueryResult)
+      }
+      hasProviders={!_.isEmpty(allProviders)}
+      error={error}
+    >
+      {providerTypes.map((provider) => (
+        <ResourceProvidersItem
+          count={allProviders[provider]}
+          key={provider}
+          link={noobaaResourcesLink}
+          title={provider}
+          unhealthyProviders={unhealthyProviders}
+        />
+      ))}
+    </ResourceProvidersBody>
+  );
+};
+
+const ResourceProviders: React.FC<{}> = () => {
+  const { t } = useCustomTranslation();
+
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const hasMCG = systemFlags[clusterNs]?.isNoobaaAvailable;
+
   return (
     <Card>
       <CardHeader>
@@ -90,24 +121,7 @@ const ResourceProviders: React.FC<{}> = () => {
         </FieldLevelHelp>
       </CardHeader>
       <CardBody>
-        <ResourceProvidersBody
-          isLoading={
-            !error &&
-            !(providersTypesQueryResult && unhealthyProvidersTypesQueryResult)
-          }
-          hasProviders={!_.isEmpty(allProviders)}
-          error={error}
-        >
-          {providerTypes.map((provider) => (
-            <ResourceProvidersItem
-              count={allProviders[provider]}
-              key={provider}
-              link={noobaaResourcesLink}
-              title={provider}
-              unhealthyProviders={unhealthyProviders}
-            />
-          ))}
-        </ResourceProvidersBody>
+        {hasMCG ? <ResourceProvidersBody_ /> : <DataUnavailableError />}
       </CardBody>
     </Card>
   );
diff --git a/packages/ocs/dashboards/object-service/status-card/status-card.tsx b/packages/ocs/dashboards/object-service/status-card/status-card.tsx
index d7bfd94bd..4cdcadfbc 100644
--- a/packages/ocs/dashboards/object-service/status-card/status-card.tsx
+++ b/packages/ocs/dashboards/object-service/status-card/status-card.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { RGW_FLAG } from '@odf/core/features';
-import { useSafeK8sWatchResource } from '@odf/core/hooks';
 import { CephObjectStoreModel } from '@odf/core/models';
 import { NooBaaSystemModel } from '@odf/core/models';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { secretResource } from '@odf/core/resources';
+import { getResourceInNs } from '@odf/core/utils';
 import {
   useCustomPrometheusPoll,
   usePrometheusBasePath,
@@ -17,10 +17,7 @@ import {
   filterRGWAlerts,
 } from '@odf/shared/utils';
 import { referenceForModel } from '@odf/shared/utils';
-import {
-  useK8sWatchResource,
-  useFlag,
-} from '@openshift-console/dynamic-plugin-sdk';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import {
   AlertsBody,
   AlertItem,
@@ -28,6 +25,7 @@ import {
 } from '@openshift-console/dynamic-plugin-sdk-internal';
 import { SubsystemHealth } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-types';
 import * as _ from 'lodash-es';
+import { useParams } from 'react-router-dom';
 import {
   Gallery,
   GalleryItem,
@@ -42,6 +40,7 @@ import {
   dataResiliencyQueryMap,
   ObjectServiceDashboardQuery,
 } from '../../../queries';
+import { ODFSystemParams } from '../../../types';
 import { decodeRGWPrefix } from '../../../utils';
 import { ObjectServiceStatus } from './object-service-health';
 import { getNooBaaState, getRGWHealthState } from './statuses';
@@ -59,6 +58,8 @@ const cephObjectStoreResource = {
 
 const ObjectStorageAlerts = () => {
   const [alerts, loaded, loadError] = useAlerts();
+  // ToDo (epic 4422): Get StorageCluster name and namespace from the Alert object
+  // and filter Alerts based on that for a particular cluster.
   const filteredAlerts =
     loaded && !loadError && !_.isEmpty(alerts)
       ? [...filterNooBaaAlerts(alerts), ...filterRGWAlerts(alerts)]
@@ -79,16 +80,24 @@ const ObjectStorageAlerts = () => {
 };
 
 const StatusCard: React.FC<{}> = () => {
-  const isRGWSupported = useFlag(RGW_FLAG);
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const isRGWSupported = systemFlags[clusterNs]?.isRGWAvailable;
+  const isMCGSupported = systemFlags[clusterNs]?.isNoobaaAvailable;
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
+
   const { t } = useCustomTranslation();
 
   const [secretData, secretLoaded, secretLoadError] =
-    useSafeK8sWatchResource<K8sResourceKind>(secretResource);
-  const [noobaa, noobaaLoaded, noobaaLoadError] =
+    useK8sWatchResource<K8sResourceKind>(secretResource(clusterNs));
+  const [noobaas, noobaaLoaded, noobaaLoadError] =
     useK8sWatchResource<K8sResourceKind[]>(noobaaResource);
-  const [rgw, rgwLoaded, rgwLoadError] = useK8sWatchResource<K8sResourceKind[]>(
-    cephObjectStoreResource
-  );
+  const [rgws, rgwLoaded, rgwLoadError] = useK8sWatchResource<
+    K8sResourceKind[]
+  >(cephObjectStoreResource);
+
+  const noobaa = getResourceInNs(noobaas, clusterNs);
+  const rgw = getResourceInNs(rgws, clusterNs);
 
   const rgwPrefix = React.useMemo(
     () =>
@@ -98,10 +107,9 @@ const StatusCard: React.FC<{}> = () => {
     [secretData, secretLoaded, secretLoadError, isRGWSupported]
   );
 
-  const rgwResiliencyQuery =
-    dataResiliencyQueryMap[
-      ObjectServiceDashboardQuery.RGW_REBUILD_PROGRESS_QUERY
-    ](rgwPrefix);
+  const rgwResiliencyQuery = dataResiliencyQueryMap[
+    ObjectServiceDashboardQuery.RGW_REBUILD_PROGRESS_QUERY
+  ](rgwPrefix, managedByOCS);
 
   const [healthStatusResult, healthStatusError] = useCustomPrometheusPoll({
     query: StatusCardQueries.HEALTH_QUERY,
@@ -130,7 +138,7 @@ const StatusCard: React.FC<{}> = () => {
   );
 
   const RGWState =
-    !rgwLoadError && rgwLoaded ? getRGWHealthState(rgw[0]) : undefined;
+    !rgwLoadError && rgwLoaded ? getRGWHealthState(rgw) : undefined;
 
   const dataResiliencyState: SubsystemHealth = getDataResiliencyState(
     [{ response: progressResult, error: progressError }],
@@ -152,14 +160,14 @@ const StatusCard: React.FC<{}> = () => {
           <GalleryItem>
             <ObjectServiceStatus
               RGWMetrics={isRGWSupported ? RGWState : undefined}
-              MCGMetrics={MCGState}
+              MCGMetrics={isMCGSupported ? MCGState : undefined}
               statusType={StatusType.HEALTH}
             />
           </GalleryItem>
           <GalleryItem>
             <ObjectServiceStatus
               RGWMetrics={isRGWSupported ? RGWResiliencyState : undefined}
-              MCGMetrics={dataResiliencyState}
+              MCGMetrics={isMCGSupported ? dataResiliencyState : undefined}
               statusType={StatusType.RESILIENCY}
             />
           </GalleryItem>
diff --git a/packages/ocs/dashboards/object-service/storage-efficiency-card/storage-efficiency-card.tsx b/packages/ocs/dashboards/object-service/storage-efficiency-card/storage-efficiency-card.tsx
index c24982965..5655dd2f1 100644
--- a/packages/ocs/dashboards/object-service/storage-efficiency-card/storage-efficiency-card.tsx
+++ b/packages/ocs/dashboards/object-service/storage-efficiency-card/storage-efficiency-card.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { ObjectStorageEfficiencyQueries } from '@odf/ocs/queries';
 import { EfficiencyItemBody } from '@odf/shared/dashboards/storage-efficiency/storage-efficiency-card-item';
+import { DataUnavailableError } from '@odf/shared/generic';
 import {
   useCustomPrometheusPoll,
   usePrometheusBasePath,
@@ -8,9 +10,11 @@ import {
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { humanizeBinaryBytes, humanizePercentage } from '@odf/shared/utils';
 import { getGaugeValue } from '@odf/shared/utils';
+import { useParams } from 'react-router-dom';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
+import { ODFSystemParams } from '../../../types';
 
-const StorageEfficiencyCard: React.FC<{}> = () => {
+const EfficiencyItemBody_: React.FC = () => {
   const { t } = useCustomTranslation();
 
   const [compressionQueryResult, compressionQueryResultError] =
@@ -84,14 +88,28 @@ const StorageEfficiencyCard: React.FC<{}> = () => {
     getStats: savingStats,
   };
 
+  return (
+    <>
+      <EfficiencyItemBody {...compressionRatioProps} />
+      <EfficiencyItemBody {...savingsProps} />
+    </>
+  );
+};
+
+const StorageEfficiencyCard: React.FC<{}> = () => {
+  const { t } = useCustomTranslation();
+
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const hasMCG = systemFlags[clusterNs]?.isNoobaaAvailable;
+
   return (
     <Card>
       <CardHeader>
         <CardTitle>{t('Storage efficiency')}</CardTitle>
       </CardHeader>
       <CardBody>
-        <EfficiencyItemBody {...compressionRatioProps} />
-        <EfficiencyItemBody {...savingsProps} />
+        {hasMCG ? <EfficiencyItemBody_ /> : <DataUnavailableError />}
       </CardBody>
     </Card>
   );
diff --git a/packages/ocs/dashboards/ocs-system-dashboard.tsx b/packages/ocs/dashboards/ocs-system-dashboard.tsx
index 2b9d6ee13..d7c8ec14a 100644
--- a/packages/ocs/dashboards/ocs-system-dashboard.tsx
+++ b/packages/ocs/dashboards/ocs-system-dashboard.tsx
@@ -6,12 +6,7 @@
  */
 
 import * as React from 'react';
-import {
-  OCS_INDEPENDENT_FLAG,
-  MCG_FLAG,
-  CEPH_FLAG,
-  OCS_NFS_ENABLED,
-} from '@odf/core/features';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { LoadingBox } from '@odf/shared/generic/status-box';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import Tabs, { TabPage } from '@odf/shared/utils/Tabs';
@@ -19,10 +14,10 @@ import {
   Overview,
   OverviewGrid,
   OverviewGridCard,
-  useFlag,
 } from '@openshift-console/dynamic-plugin-sdk';
 import { TFunction } from 'i18next';
-import { RouteComponentProps } from 'react-router-dom';
+import { RouteComponentProps, useParams } from 'react-router-dom';
+import { ODFSystemParams } from '../types';
 import { StatusCard as NFSStatusCard } from './network-file-system/status-card/status-card';
 import { ThroughputCard } from './network-file-system/throughput-card/throughput-card';
 import { TopClientsCard } from './network-file-system/top-clients-card/top-clients-card';
@@ -185,10 +180,15 @@ const nfsPage = (t: TFunction): TabPage => {
 const OCSSystemDashboard: React.FC<RouteComponentProps> = () => {
   const { t } = useCustomTranslation();
 
-  const isIndependent = useFlag(OCS_INDEPENDENT_FLAG);
-  const isObjectServiceAvailable = useFlag(MCG_FLAG);
-  const isCephAvailable = useFlag(CEPH_FLAG);
-  const isNFSEnabled = useFlag(OCS_NFS_ENABLED);
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+
+  const isIndependent = systemFlags[clusterNs]?.isExternalMode;
+  const isMCGAvailable = systemFlags[clusterNs]?.isNoobaaAvailable;
+  const isRGWAvailable = systemFlags[clusterNs]?.isRGWAvailable;
+  const isObjectServiceAvailable = isMCGAvailable || isRGWAvailable;
+  const isCephAvailable = systemFlags[clusterNs]?.isCephAvailable;
+  const isNFSEnabled = systemFlags[clusterNs]?.isNFSEnabled;
 
   const showInternalDashboard = !isIndependent && isCephAvailable;
   const showNFSDashboard = !isIndependent && isNFSEnabled;
diff --git a/packages/ocs/dashboards/odf-system-dashboard.tsx b/packages/ocs/dashboards/odf-system-dashboard.tsx
index c59b27b5c..8736188c0 100644
--- a/packages/ocs/dashboards/odf-system-dashboard.tsx
+++ b/packages/ocs/dashboards/odf-system-dashboard.tsx
@@ -1,15 +1,15 @@
 import * as React from 'react';
 import NamespaceSafetyBox from '@odf/core/components/utils/safety-box';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import PageHeading from '@odf/shared/heading/page-heading';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { referenceForModel } from '@odf/shared/utils';
 import Tabs, { TabPage } from '@odf/shared/utils/Tabs';
-import { useFlag } from '@openshift-console/dynamic-plugin-sdk';
 import { RouteComponentProps } from 'react-router';
-import { match as Match } from 'react-router-dom';
-import { CEPH_FLAG, OCS_INDEPENDENT_FLAG } from '../../odf/features';
+import { match as Match, useParams } from 'react-router-dom';
 import { BlockPoolListPage } from '../block-pool/BlockPoolListPage';
 import { CephBlockPoolModel } from '../models';
+import { ODFSystemParams } from '../types';
 import OCSSystemDashboard from './ocs-system-dashboard';
 
 export type DashboardsPageProps = RouteComponentProps;
@@ -24,6 +24,11 @@ const ODFSystemDashboard: React.FC<ODFSystemDashboardPageProps> = ({
   match,
 }) => {
   const { t } = useCustomTranslation();
+
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags, areFlagsLoaded, flagsLoadError } =
+    useODFSystemFlagsSelector();
+
   const breadcrumbs = [
     {
       name: t('StorageSystems'),
@@ -42,8 +47,8 @@ const ODFSystemDashboard: React.FC<ODFSystemDashboardPageProps> = ({
       component: OCSSystemDashboard,
     },
   ]);
-  const isCephAvailable = useFlag(CEPH_FLAG);
-  const isExternal = useFlag(OCS_INDEPENDENT_FLAG);
+  const isCephAvailable = systemFlags[clusterNs]?.isCephAvailable;
+  const isExternal = systemFlags[clusterNs]?.isExternalMode;
 
   React.useEffect(() => {
     const isBlockPoolAdded = pages.find((page) => page.href === blockPoolHref);
@@ -63,12 +68,15 @@ const ODFSystemDashboard: React.FC<ODFSystemDashboardPageProps> = ({
   }, [isExternal, isCephAvailable, pages, setPages, t]);
 
   const title = match.params.systemName;
-  const arePagesLoaded = pages.length > 0;
+  const loaded = pages.length > 0 && areFlagsLoaded;
 
   return (
     <>
       <PageHeading title={title} breadcrumbs={breadcrumbs} />
-      <NamespaceSafetyBox areResourcesLoaded={arePagesLoaded}>
+      <NamespaceSafetyBox
+        areResourcesLoaded={loaded}
+        resourcesError={flagsLoadError}
+      >
         <Tabs id="odf-tab" match={match} tabs={pages} />
       </NamespaceSafetyBox>
     </>
diff --git a/packages/ocs/dashboards/persistent-external/breakdown-card.tsx b/packages/ocs/dashboards/persistent-external/breakdown-card.tsx
index c2c4fe1b5..bf5e97040 100644
--- a/packages/ocs/dashboards/persistent-external/breakdown-card.tsx
+++ b/packages/ocs/dashboards/persistent-external/breakdown-card.tsx
@@ -1,5 +1,8 @@
 import * as React from 'react';
-import { useODFNamespaceSelector } from '@odf/core/redux';
+import {
+  useODFNamespaceSelector,
+  useODFSystemFlagsSelector,
+} from '@odf/core/redux';
 import { BreakdownCardBody } from '@odf/shared/dashboards/breakdown-card/breakdown-body';
 import { getSelectOptions } from '@odf/shared/dashboards/breakdown-card/breakdown-dropdown';
 import {
@@ -16,6 +19,7 @@ import {
   getInstantVectorStats,
   sortInstantVectorStats,
 } from '@odf/shared/utils';
+import { useParams } from 'react-router-dom';
 import {
   Select,
   SelectProps,
@@ -25,6 +29,7 @@ import {
   CardTitle,
 } from '@patternfly/react-core';
 import { getBreakdownMetricsQuery } from '../../queries';
+import { ODFSystemParams } from '../../types';
 import { getStackChartStats } from '../../utils/metrics';
 import {
   NamespaceDropdown,
@@ -41,10 +46,16 @@ export const BreakdownCard: React.FC = () => {
   const [isOpenBreakdownSelect, setBreakdownSelect] = React.useState(false);
   const [pvcNamespace, setPVCNamespace] = React.useState('');
 
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
   const { odfNamespace } = useODFNamespaceSelector();
+  const { systemFlags } = useODFSystemFlagsSelector();
+
+  // name of created StorageClasses are prefix by StorageCluster name
+  const storageClassNamePrefix = systemFlags[clusterNs]?.ocsClusterName;
 
   const { queries, model, metric } = getBreakdownMetricsQuery(
     metricType,
+    storageClassNamePrefix,
     pvcNamespace,
     true
   );
diff --git a/packages/ocs/dashboards/persistent-external/details-card.tsx b/packages/ocs/dashboards/persistent-external/details-card.tsx
index 4ee8de349..5f844c224 100644
--- a/packages/ocs/dashboards/persistent-external/details-card.tsx
+++ b/packages/ocs/dashboards/persistent-external/details-card.tsx
@@ -1,23 +1,32 @@
 import * as React from 'react';
 import { CEPH_BRAND_NAME, OCS_OPERATOR } from '@odf/core/constants';
 import { ODF_MODEL_FLAG } from '@odf/core/features';
-import { useSafeK8sWatchResources } from '@odf/core/hooks';
 import { useODFNamespaceSelector } from '@odf/core/redux';
 import { getOperatorVersion } from '@odf/core/utils';
+import { getStorageClusterInNs } from '@odf/core/utils';
 import { ODF_OPERATOR } from '@odf/shared/constants';
 import { useFetchCsv } from '@odf/shared/hooks/use-fetch-csv';
 import { SecretModel } from '@odf/shared/models';
 import { getName } from '@odf/shared/selectors';
-import { SecretKind, K8sResourceKind } from '@odf/shared/types';
+import {
+  SecretKind,
+  K8sResourceKind,
+  StorageClusterKind,
+} from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { referenceForModel } from '@odf/shared/utils';
 import { ExternalLink } from '@odf/shared/utils/link';
-import { useFlag } from '@openshift-console/dynamic-plugin-sdk';
+import {
+  useFlag,
+  useK8sWatchResources,
+} from '@openshift-console/dynamic-plugin-sdk';
 import { DetailsBody } from '@openshift-console/dynamic-plugin-sdk-internal';
 import { OverviewDetailItem as DetailItem } from '@openshift-console/plugin-shared';
 import { Base64 } from 'js-base64';
+import { useParams } from 'react-router-dom';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
 import { StorageClusterModel } from '../../models';
+import { ODFSystemParams } from '../../types';
 import { getNetworkEncryption } from '../../utils';
 
 const getCephLink = (secret: SecretKind): string => {
@@ -33,16 +42,14 @@ type ResourcesObject = {
   };
 };
 
-const k8sResources = (ns: string) => ({
+const k8sResources = (clusterNs: string) => ({
   ocs: {
     kind: referenceForModel(StorageClusterModel),
-    namespaced: true,
     isList: true,
-    namespace: ns,
   },
   secret: {
     kind: SecretModel.kind,
-    namespace: ns,
+    namespace: clusterNs,
     name: 'rook-ceph-dashboard-link',
   },
 });
@@ -52,15 +59,19 @@ export const DetailsCard: React.FC = () => {
   const isODF = useFlag(ODF_MODEL_FLAG);
 
   const { odfNamespace, isNsSafe } = useODFNamespaceSelector();
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
 
-  const resourcesObj: ResourcesObject = useSafeK8sWatchResources(k8sResources);
-  const inTransitEncryptionStatus = getNetworkEncryption(
-    resourcesObj['ocs'].data?.[0]
-  )
+  const resourcesObj: ResourcesObject = useK8sWatchResources(
+    k8sResources(clusterNs)
+  );
+  const ocsCluster = getStorageClusterInNs(
+    resourcesObj['ocs'].data as StorageClusterKind[],
+    clusterNs
+  );
+  const inTransitEncryptionStatus = getNetworkEncryption(ocsCluster)
     ? t('Enabled')
     : t('Disabled');
-
-  const ocsName = getName(resourcesObj['ocs'].data?.[0]);
+  const ocsName = getName(ocsCluster);
 
   const [csv, csvLoaded, csvError] = useFetchCsv({
     specName: !isODF ? OCS_OPERATOR : ODF_OPERATOR,
diff --git a/packages/ocs/dashboards/persistent-external/status-card.tsx b/packages/ocs/dashboards/persistent-external/status-card.tsx
index 24ca11c3f..ce6e2f907 100644
--- a/packages/ocs/dashboards/persistent-external/status-card.tsx
+++ b/packages/ocs/dashboards/persistent-external/status-card.tsx
@@ -1,12 +1,15 @@
 import * as React from 'react';
 import { cephClusterResource } from '@odf/core/resources';
-import { K8sResourceKind } from '@odf/shared/types';
+import { getResourceInNs as getCephClusterInNs } from '@odf/core/utils';
+import { getCephHealthState } from '@odf/ocs/utils';
+import { K8sResourceKind, CephClusterKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import {
   HealthBody,
   HealthItem,
 } from '@openshift-console/dynamic-plugin-sdk-internal';
+import { useParams } from 'react-router-dom';
 import {
   GalleryItem,
   Gallery,
@@ -14,15 +17,23 @@ import {
   CardHeader,
   CardTitle,
 } from '@patternfly/react-core';
-import { getCephHealthState } from '../persistent-internal/status-card/utils';
+import { ODFSystemParams } from '../../types';
 
 export const StatusCard: React.FC = () => {
   const { t } = useCustomTranslation();
   const [data, loaded, loadError] =
     useK8sWatchResource<K8sResourceKind[]>(cephClusterResource);
 
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+
   const cephHealth = getCephHealthState(
-    { ceph: { data, loaded, loadError } },
+    {
+      ceph: {
+        data: getCephClusterInNs(data as CephClusterKind[], clusterNs),
+        loaded,
+        loadError,
+      },
+    },
     t
   );
 
diff --git a/packages/ocs/dashboards/persistent-external/utilization-card.tsx b/packages/ocs/dashboards/persistent-external/utilization-card.tsx
index 508761468..f334636e8 100644
--- a/packages/ocs/dashboards/persistent-external/utilization-card.tsx
+++ b/packages/ocs/dashboards/persistent-external/utilization-card.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { PrometheusUtilizationItem } from '@odf/shared/dashboards/utilization-card/prometheus-utilization-item';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { humanizeBinaryBytes } from '@odf/shared/utils';
@@ -7,6 +8,7 @@ import {
   UtilizationBody,
 } from '@openshift-console/dynamic-plugin-sdk-internal';
 import { ByteDataTypes } from '@openshift-console/dynamic-plugin-sdk/lib/api/internal-types';
+import { useParams } from 'react-router-dom';
 import {
   Card,
   CardActions,
@@ -18,16 +20,25 @@ import {
   StorageDashboardQuery,
   INDEPENDENT_UTILIZATION_QUERIES,
 } from '../../queries';
+import { ODFSystemParams } from '../../types';
 
 export const UtilizationContent: React.FC = () => {
   const { t } = useCustomTranslation();
 
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+
+  // name of created StorageClasses are prefix by StorageCluster name
+  const storageClassNamePrefix = systemFlags[clusterNs]?.ocsClusterName;
+
   return (
     <UtilizationBody>
       <PrometheusUtilizationItem
         title={t('Used capacity')}
         utilizationQuery={
-          INDEPENDENT_UTILIZATION_QUERIES[StorageDashboardQuery.USED_CAPACITY]
+          INDEPENDENT_UTILIZATION_QUERIES(storageClassNamePrefix)[
+            StorageDashboardQuery.USED_CAPACITY
+          ]
         }
         humanizeValue={humanizeBinaryBytes}
         byteDataType={ByteDataTypes.BinaryBytes}
@@ -35,7 +46,7 @@ export const UtilizationContent: React.FC = () => {
       <PrometheusUtilizationItem
         title={t('Requested capacity')}
         utilizationQuery={
-          INDEPENDENT_UTILIZATION_QUERIES[
+          INDEPENDENT_UTILIZATION_QUERIES(storageClassNamePrefix)[
             StorageDashboardQuery.REQUESTED_CAPACITY
           ]
         }
diff --git a/packages/ocs/dashboards/persistent-internal/activity-card/activity-card.tsx b/packages/ocs/dashboards/persistent-internal/activity-card/activity-card.tsx
index b1f0829e4..c14578146 100644
--- a/packages/ocs/dashboards/persistent-internal/activity-card/activity-card.tsx
+++ b/packages/ocs/dashboards/persistent-internal/activity-card/activity-card.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { useODFNamespaceSelector } from '@odf/core/redux';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
+import { getStorageClusterInNs } from '@odf/core/utils';
 import {
   useCustomPrometheusPoll,
   usePrometheusBasePath,
@@ -15,6 +16,7 @@ import {
   K8sResourceKind,
   PersistentVolumeClaimKind,
   SubscriptionKind,
+  StorageClusterKind,
 } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { getResiliencyProgress, referenceForModel } from '@odf/shared/utils';
@@ -26,6 +28,7 @@ import {
 } from '@openshift-console/dynamic-plugin-sdk-internal';
 import { EventKind } from '@openshift-console/dynamic-plugin-sdk/lib/api/internal-types';
 import * as _ from 'lodash-es';
+import { useParams } from 'react-router-dom';
 import { Card, CardHeader, CardTitle } from '@patternfly/react-core';
 import { OCS_OPERATOR, PVC_PROVISIONER_ANNOTATION } from '../../../constants';
 import { StorageClusterModel } from '../../../models';
@@ -33,6 +36,7 @@ import {
   DATA_RESILIENCY_QUERY,
   StorageDashboardQuery,
 } from '../../../queries/ceph-storage';
+import { ODFSystemParams } from '../../../types';
 import {
   isCephProvisioner,
   isPersistentStorageEvent,
@@ -66,7 +70,7 @@ export const eventsResource = {
 };
 
 const RecentEvent: React.FC = () => {
-  const { odfNamespace } = useODFNamespaceSelector();
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
 
   const [pvcs, pvcLoaded] =
     useK8sWatchResource<PersistentVolumeClaimKind[]>(pvcResource);
@@ -81,8 +85,8 @@ const RecentEvent: React.FC = () => {
   const memoizedPVCNames = useDeepCompareMemoize(validPVC, true);
 
   const ocsEventsFilter = React.useCallback(
-    () => isPersistentStorageEvent(memoizedPVCNames, odfNamespace),
-    [memoizedPVCNames, odfNamespace]
+    () => isPersistentStorageEvent(memoizedPVCNames, clusterNs),
+    [memoizedPVCNames, clusterNs]
   );
 
   const eventObject = {
@@ -98,29 +102,39 @@ const RecentEvent: React.FC = () => {
 export const subscriptionResource = {
   isList: true,
   kind: referenceForModel(SubscriptionModel),
-  namespaced: false,
 };
 
 export const storageClusterResource = {
   isList: true,
   kind: referenceForModel(StorageClusterModel),
-  namespaced: false,
 };
 
 const OngoingActivity = () => {
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
+
   const [subscriptions, subLoaded] =
     useK8sWatchResource<K8sResourceKind[]>(subscriptionResource);
-  const [cluster, clusterLoaded] = useK8sWatchResource(storageClusterResource);
+  const [clusters, clusterLoaded] = useK8sWatchResource<StorageClusterKind[]>(
+    storageClusterResource
+  );
 
   const [resiliencyMetric, , metricsLoading] = useCustomPrometheusPoll({
-    query: DATA_RESILIENCY_QUERY[StorageDashboardQuery.RESILIENCY_PROGRESS],
+    query:
+      DATA_RESILIENCY_QUERY(managedByOCS)[
+        StorageDashboardQuery.RESILIENCY_PROGRESS
+      ],
     endpoint: 'api/v1/query' as any,
     basePath: usePrometheusBasePath(),
   });
 
   const ocsSubscription: SubscriptionKind = getOCSSubscription(subscriptions);
 
-  const ocsCluster: K8sResourceKind = cluster?.[0];
+  const ocsCluster: K8sResourceKind = getStorageClusterInNs(
+    clusters,
+    clusterNs
+  );
 
   const prometheusActivities = [];
   const resourceActivities = [];
diff --git a/packages/ocs/dashboards/persistent-internal/capacity-breakdown-card/capacity-breakdown-card.tsx b/packages/ocs/dashboards/persistent-internal/capacity-breakdown-card/capacity-breakdown-card.tsx
index 28652125a..4028d8b5e 100644
--- a/packages/ocs/dashboards/persistent-internal/capacity-breakdown-card/capacity-breakdown-card.tsx
+++ b/packages/ocs/dashboards/persistent-internal/capacity-breakdown-card/capacity-breakdown-card.tsx
@@ -1,5 +1,8 @@
 import * as React from 'react';
-import { useODFNamespaceSelector } from '@odf/core/redux';
+import {
+  useODFNamespaceSelector,
+  useODFSystemFlagsSelector,
+} from '@odf/core/redux';
 import { namespaceResource } from '@odf/core/resources';
 import { BreakdownCardBody } from '@odf/shared/dashboards/breakdown-card/breakdown-body';
 import { getSelectOptions } from '@odf/shared/dashboards/breakdown-card/breakdown-dropdown';
@@ -22,6 +25,7 @@ import {
   sortInstantVectorStats,
 } from '@odf/shared/utils';
 import { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
+import { useParams } from 'react-router-dom';
 import {
   Select,
   SelectProps,
@@ -35,6 +39,7 @@ import {
   CEPH_CAPACITY_BREAKDOWN_QUERIES,
   StorageDashboardQuery,
 } from '../../../queries/ceph-storage';
+import { ODFSystemParams } from '../../../types';
 import { getStackChartStats } from '../../../utils/metrics';
 import './capacity-breakdown-card.scss';
 
@@ -130,9 +135,19 @@ const BreakdownCard: React.FC = () => {
   const [isOpenBreakdownSelect, setBreakdownSelect] = React.useState(false);
   const [pvcNamespace, setPVCNamespace] = React.useState('');
 
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+
+  // name of the created StorageClasses are prefix by StorageCluster name,
+  // it is also the value of the "managedBy" label in the metrics.
+  const ocsCluster = systemFlags[clusterNs]?.ocsClusterName;
+
   const { queries, model, metric } = getBreakdownMetricsQuery(
     metricType,
-    pvcNamespace
+    ocsCluster,
+    pvcNamespace,
+    false,
+    ocsCluster
   );
 
   const { odfNamespace } = useODFNamespaceSelector();
@@ -150,8 +165,9 @@ const BreakdownCard: React.FC = () => {
       basePath: usePrometheusBasePath(),
     });
   const [cephUsedMetric, cephError, cephLoading] = useCustomPrometheusPoll({
-    query:
-      CEPH_CAPACITY_BREAKDOWN_QUERIES[StorageDashboardQuery.CEPH_CAPACITY_USED],
+    query: CEPH_CAPACITY_BREAKDOWN_QUERIES(ocsCluster, ocsCluster)[
+      StorageDashboardQuery.CEPH_CAPACITY_USED
+    ],
     endpoint: 'api/v1/query' as any,
     basePath: usePrometheusBasePath(),
   });
diff --git a/packages/ocs/dashboards/persistent-internal/details-card.tsx b/packages/ocs/dashboards/persistent-internal/details-card.tsx
index e257287ad..514db6a11 100644
--- a/packages/ocs/dashboards/persistent-internal/details-card.tsx
+++ b/packages/ocs/dashboards/persistent-internal/details-card.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { useSafeK8sList } from '@odf/core/hooks';
 import { useODFNamespaceSelector } from '@odf/core/redux';
 import { getOperatorVersion } from '@odf/core/utils';
+import { getStorageClusterInNs } from '@odf/core/utils';
 import { ODF_OPERATOR } from '@odf/shared/constants';
 import { useK8sGet } from '@odf/shared/hooks/k8s-get-hook';
 import { useFetchCsv } from '@odf/shared/hooks/use-fetch-csv';
@@ -15,34 +15,43 @@ import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import {
   getInfrastructurePlatform,
   resourcePathFromModel,
+  referenceForModel,
 } from '@odf/shared/utils';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { DetailsBody } from '@openshift-console/dynamic-plugin-sdk-internal';
 import { OverviewDetailItem as DetailItem } from '@openshift-console/plugin-shared';
-import { Link } from 'react-router-dom';
+import { Link, useParams } from 'react-router-dom';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
 import { StorageClusterModel } from '../../models';
+import { ODFSystemParams } from '../../types';
 import { getNetworkEncryption } from '../../utils';
 
+const storageClusterResource = {
+  kind: referenceForModel(StorageClusterModel),
+  isList: true,
+};
+
 const DetailsCard: React.FC = () => {
   const { t } = useCustomTranslation();
+  const { namespace: ocsNs } = useParams<ODFSystemParams>();
 
   const { odfNamespace, isNsSafe } = useODFNamespaceSelector();
 
   const [infrastructure, infrastructureLoaded, infrastructureError] =
     useK8sGet<K8sResourceKind>(InfrastructureModel, 'cluster');
-  const [ocsData, ocsLoaded, ocsError] = useSafeK8sList<StorageClusterKind>(
-    StorageClusterModel,
-    odfNamespace
-  );
+
+  const [ocsData, ocsLoaded, ocsError] = useK8sWatchResource<
+    StorageClusterKind[]
+  >(storageClusterResource);
+
   const [csv, csvLoaded, csvError] = useFetchCsv({
     specName: ODF_OPERATOR,
     namespace: odfNamespace,
     startPollingInstantly: isNsSafe,
   });
+
   const infrastructurePlatform = getInfrastructurePlatform(infrastructure);
-  const cluster: StorageClusterKind = ocsData?.find(
-    (item: StorageClusterKind) => item.status.phase !== 'Ignored'
-  );
+  const cluster: StorageClusterKind = getStorageClusterInNs(ocsData, ocsNs);
   const ocsName = getName(cluster);
   const inTransitEncryptionStatus = getNetworkEncryption(cluster)
     ? t('Enabled')
diff --git a/packages/ocs/dashboards/persistent-internal/inventory-card.tsx b/packages/ocs/dashboards/persistent-internal/inventory-card.tsx
index aa8d8882e..34dd9dacc 100644
--- a/packages/ocs/dashboards/persistent-internal/inventory-card.tsx
+++ b/packages/ocs/dashboards/persistent-internal/inventory-card.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { cephStorageLabel } from '@odf/core/constants';
-import { useODFNamespaceSelector } from '@odf/core/redux';
 import {
   NodeModel,
   PersistentVolumeClaimModel,
@@ -18,7 +17,9 @@ import { NodeKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { useK8sWatchResources } from '@openshift-console/dynamic-plugin-sdk';
 import { ResourceInventoryItem } from '@openshift-console/dynamic-plugin-sdk-internal';
+import { useParams } from 'react-router-dom';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
+import { ODFSystemParams } from '../../types';
 import {
   getCephNodes,
   getCephPVCs,
@@ -47,7 +48,7 @@ const watchResources = {
 const InventoryCard: React.FC = () => {
   const { t } = useCustomTranslation();
 
-  const { odfNamespace } = useODFNamespaceSelector();
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
 
   const resources = useK8sWatchResources(watchResources);
 
@@ -79,7 +80,7 @@ const InventoryCard: React.FC = () => {
           isLoading={!nodesLoaded}
           error={!!nodesLoadError}
           kind={NodeModel as any}
-          resources={getCephNodes(nodesData, odfNamespace)}
+          resources={getCephNodes(nodesData, clusterNs)}
           mapper={getNodeStatusGroups}
           basePath={ocsNodesHref}
         />
diff --git a/packages/ocs/dashboards/persistent-internal/raw-capacity-card/raw-capacity-card.tsx b/packages/ocs/dashboards/persistent-internal/raw-capacity-card/raw-capacity-card.tsx
index 02e753da5..de76cb6d6 100644
--- a/packages/ocs/dashboards/persistent-internal/raw-capacity-card/raw-capacity-card.tsx
+++ b/packages/ocs/dashboards/persistent-internal/raw-capacity-card/raw-capacity-card.tsx
@@ -1,15 +1,18 @@
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import {
   useCustomPrometheusPoll,
   usePrometheusBasePath,
 } from '@odf/shared/hooks/custom-prometheus-poll';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { getInstantVectorStats } from '@odf/shared/utils';
+import { useParams } from 'react-router-dom';
 import { compose } from 'redux';
 import {
   CAPACITY_INFO_QUERIES,
   StorageDashboardQuery,
 } from '../../../queries/ceph-storage';
+import { ODFSystemParams } from '../../../types';
 import {
   CapacityCard,
   CapacityCardProps,
@@ -21,13 +24,23 @@ const parser = compose((val) => val?.[0]?.y, getInstantVectorStats);
 const RawCapacityCard: React.FC = () => {
   const { t } = useCustomTranslation();
 
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
+
   const [totalCapacity, totalError, totalLoading] = useCustomPrometheusPoll({
-    query: CAPACITY_INFO_QUERIES[StorageDashboardQuery.RAW_CAPACITY_TOTAL],
+    query:
+      CAPACITY_INFO_QUERIES(managedByOCS)[
+        StorageDashboardQuery.RAW_CAPACITY_TOTAL
+      ],
     endpoint: 'api/v1/query' as any,
     basePath: usePrometheusBasePath(),
   });
   const [usedCapacity, usedError, usedLoading] = useCustomPrometheusPoll({
-    query: CAPACITY_INFO_QUERIES[StorageDashboardQuery.RAW_CAPACITY_USED],
+    query:
+      CAPACITY_INFO_QUERIES(managedByOCS)[
+        StorageDashboardQuery.RAW_CAPACITY_USED
+      ],
     endpoint: 'api/v1/query' as any,
     basePath: usePrometheusBasePath(),
   });
diff --git a/packages/ocs/dashboards/persistent-internal/status-card/status-card.tsx b/packages/ocs/dashboards/persistent-internal/status-card/status-card.tsx
index 5d361afba..7fe119951 100644
--- a/packages/ocs/dashboards/persistent-internal/status-card/status-card.tsx
+++ b/packages/ocs/dashboards/persistent-internal/status-card/status-card.tsx
@@ -1,4 +1,7 @@
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
+import { getResourceInNs as getCephClusterInNs } from '@odf/core/utils';
+import { getCephHealthState } from '@odf/ocs/utils';
 import { healthStateMapping } from '@odf/shared/dashboards/status-card/states';
 import {
   useCustomPrometheusPoll,
@@ -22,6 +25,7 @@ import {
 } from '@openshift-console/dynamic-plugin-sdk-internal';
 import { SubsystemHealth } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-types';
 import * as _ from 'lodash-es';
+import { useParams } from 'react-router-dom';
 import {
   Gallery,
   GalleryItem,
@@ -34,12 +38,15 @@ import {
 import { CephClusterModel } from '../../../models';
 import { DATA_RESILIENCY_QUERY, StorageDashboardQuery } from '../../../queries';
 import { OSDMigrationProgress } from './osd-migration/osd-migration-progress';
-import { getCephHealthState, getDataResiliencyState } from './utils';
+import { ODFSystemParams } from '../../../types';
+import { getDataResiliencyState } from './utils';
 import { whitelistedHealthChecksRef } from './whitelisted-health-checks';
 import './healthchecks.scss';
 
-const resiliencyProgressQuery =
-  DATA_RESILIENCY_QUERY[StorageDashboardQuery.RESILIENCY_PROGRESS];
+const resiliencyProgressQuery = (managedByOCS: string) =>
+  DATA_RESILIENCY_QUERY(managedByOCS)[
+    StorageDashboardQuery.RESILIENCY_PROGRESS
+  ];
 
 const generateDocumentationLink = (alert: Alert): string => {
   return `https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.12/html-single/troubleshooting_openshift_data_foundation/index#${_.toLower(
@@ -60,6 +67,8 @@ const getDocumentationLink = (alert: Alert): string => {
 
 export const CephAlerts: React.FC = () => {
   const [alerts, loaded, error] = useAlerts();
+  // ToDo (epic 4422): Get StorageCluster name and namespace from the Alert object
+  // and filter Alerts based on that for a particular cluster.
   const filteredAlerts =
     loaded && !error && !_.isEmpty(alerts) ? filterCephAlerts(alerts) : [];
 
@@ -112,7 +121,6 @@ const CephHealthCheck: React.FC<CephHealthCheckProps> = ({
 
 export const cephClusterResource = {
   kind: referenceForModel(CephClusterModel),
-  namespaced: false,
   isList: true,
 };
 
@@ -121,16 +129,22 @@ export const StatusCard: React.FC = () => {
   const [data, loaded, loadError] =
     useK8sWatchResource<K8sResourceKind[]>(cephClusterResource);
 
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
+
   const [resiliencyProgress, resiliencyProgressError] = useCustomPrometheusPoll(
     {
-      query: resiliencyProgressQuery,
+      query: resiliencyProgressQuery(managedByOCS),
       endpoint: 'api/v1/query' as any,
       basePath: usePrometheusBasePath(),
     }
   );
 
+  const cephCluster = getCephClusterInNs(data, clusterNs);
+
   const cephHealthState = getCephHealthState(
-    { ceph: { data, loaded, loadError } },
+    { ceph: { data: cephCluster, loaded, loadError } },
     t
   );
   const dataResiliencyState = getDataResiliencyState(
@@ -140,7 +154,7 @@ export const StatusCard: React.FC = () => {
 
   const pattern = /[A-Z]+_*|error/g;
   const healthChecks: CephHealthCheckType[] = [];
-  const cephDetails = data?.[0]?.status?.ceph?.details;
+  const cephDetails = cephCluster?.status?.ceph?.details;
   for (const key in cephDetails) {
     if (pattern.test(key)) {
       const healthCheckObject: CephHealthCheckType = {
@@ -184,7 +198,7 @@ export const StatusCard: React.FC = () => {
           </GalleryItem>
         </Gallery>
       </HealthBody>
-      <OSDMigrationProgress cephData={data?.[0]} />
+      <OSDMigrationProgress cephData={cephCluster} />
       <CephAlerts />
     </Card>
   );
diff --git a/packages/ocs/dashboards/persistent-internal/status-card/utils.ts b/packages/ocs/dashboards/persistent-internal/status-card/utils.ts
index 31df14ed1..9718d0bca 100644
--- a/packages/ocs/dashboards/persistent-internal/status-card/utils.ts
+++ b/packages/ocs/dashboards/persistent-internal/status-card/utils.ts
@@ -1,52 +1,6 @@
 import { getResiliencyProgress } from '@odf/shared/utils';
 import { HealthState } from '@openshift-console/dynamic-plugin-sdk';
-import {
-  PrometheusHealthHandler,
-  ResourceHealthHandler,
-  SubsystemHealth,
-} from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-types';
-import { TFunction } from 'i18next';
-import { WatchCephResource } from '../../../utils';
-
-const CephHealthStatus = (status: string, t: TFunction): SubsystemHealth => {
-  switch (status) {
-    case 'HEALTH_OK':
-      return {
-        state: HealthState.OK,
-      };
-    case 'HEALTH_WARN':
-      return {
-        state: HealthState.WARNING,
-        message: t('Warning'),
-      };
-    case 'HEALTH_ERR':
-      return {
-        state: HealthState.ERROR,
-        message: t('Error'),
-      };
-    default:
-      return { state: HealthState.UNKNOWN };
-  }
-};
-
-export const getCephHealthState: ResourceHealthHandler<WatchCephResource> = (
-  { ceph },
-  t
-) => {
-  const { data, loaded, loadError } = ceph;
-  const status = data?.[0]?.status?.ceph?.health;
-
-  if (loadError) {
-    return { state: HealthState.NOT_AVAILABLE };
-  }
-  if (!loaded) {
-    return { state: HealthState.LOADING };
-  }
-  if (data.length === 0) {
-    return { state: HealthState.NOT_AVAILABLE };
-  }
-  return CephHealthStatus(status, t);
-};
+import { PrometheusHealthHandler } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-types';
 
 export const getDataResiliencyState: PrometheusHealthHandler = (
   responses,
diff --git a/packages/ocs/dashboards/persistent-internal/storage-efficiency-card/storage-efficiency-card.tsx b/packages/ocs/dashboards/persistent-internal/storage-efficiency-card/storage-efficiency-card.tsx
index 3e53794cd..858961b21 100644
--- a/packages/ocs/dashboards/persistent-internal/storage-efficiency-card/storage-efficiency-card.tsx
+++ b/packages/ocs/dashboards/persistent-internal/storage-efficiency-card/storage-efficiency-card.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { EfficiencyItemBody } from '@odf/shared/dashboards/storage-efficiency/storage-efficiency-card-item';
 import {
   useCustomPrometheusPoll,
@@ -6,19 +7,25 @@ import {
 } from '@odf/shared/hooks/custom-prometheus-poll';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { getGaugeValue, humanizeBinaryBytes } from '@odf/shared/utils';
+import { useParams } from 'react-router-dom';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
 import {
   POOL_STORAGE_EFFICIENCY_QUERIES,
   StorageDashboardQuery,
 } from '../../../queries';
+import { ODFSystemParams } from '../../../types';
 
 export const StorageEfficiencyContent: React.FC = () => {
   const { t } = useCustomTranslation();
 
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const managedByOCS = systemFlags[clusterNs]?.ocsClusterName;
+
   const [poolCapacityRatioResult, poolCapacityRatioResultError] =
     useCustomPrometheusPoll({
       query:
-        POOL_STORAGE_EFFICIENCY_QUERIES[
+        POOL_STORAGE_EFFICIENCY_QUERIES(managedByOCS)[
           StorageDashboardQuery.POOL_CAPACITY_RATIO
         ],
       endpoint: 'api/v1/query' as any,
@@ -27,7 +34,7 @@ export const StorageEfficiencyContent: React.FC = () => {
 
   const [poolSavedResult, poolSavedResultError] = useCustomPrometheusPoll({
     query:
-      POOL_STORAGE_EFFICIENCY_QUERIES[
+      POOL_STORAGE_EFFICIENCY_QUERIES(managedByOCS)[
         StorageDashboardQuery.POOL_SAVED_CAPACITY
       ],
     endpoint: 'api/v1/query' as any,
diff --git a/packages/ocs/dashboards/persistent-internal/utilization-card/utilization-card.tsx b/packages/ocs/dashboards/persistent-internal/utilization-card/utilization-card.tsx
index e61acbde0..3147d3404 100644
--- a/packages/ocs/dashboards/persistent-internal/utilization-card/utilization-card.tsx
+++ b/packages/ocs/dashboards/persistent-internal/utilization-card/utilization-card.tsx
@@ -1,5 +1,6 @@
 // TODO (@rexagod): https://github.com/openshift/console/pull/10470#discussion_r766453369
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import ConsumerPopover from '@odf/shared/dashboards/utilization-card/ConsumerPopover';
 import { PrometheusMultilineUtilizationItem } from '@odf/shared/dashboards/utilization-card/prometheus-multi-utilization-item';
 import { PrometheusUtilizationItem } from '@odf/shared/dashboards/utilization-card/prometheus-utilization-item';
@@ -11,6 +12,7 @@ import {
 } from '@odf/shared/utils';
 import { UtilizationDurationDropdown } from '@openshift-console/dynamic-plugin-sdk-internal';
 import { ByteDataTypes } from '@openshift-console/dynamic-plugin-sdk/lib/api/internal-types';
+import { useParams } from 'react-router-dom';
 import {
   Card,
   CardActions,
@@ -23,21 +25,29 @@ import {
   utilizationPopoverQueryMap,
   UTILIZATION_QUERY,
 } from '../../../queries';
+import { ODFSystemParams } from '../../../types';
 import { humanizeIOPS, humanizeLatency } from './utils';
 import '@odf/shared/dashboards/utilization-card/utilization-card.scss';
 
 export const UtilizationContent: React.FC = () => {
   const { t } = useCustomTranslation();
+
+  const { namespace: clusterNs } = useParams<ODFSystemParams>();
+  const { systemFlags } = useODFSystemFlagsSelector();
+  // name of the created StorageClasses are prefix by StorageCluster name,
+  // it is also the value of the "managedBy" label in the metrics.
+  const ocsCluster = systemFlags[clusterNs]?.ocsClusterName;
+
   const storagePopover = React.useCallback(
     ({ current }) => (
       <ConsumerPopover
         title={t('Used Capacity')}
         current={current}
-        consumers={utilizationPopoverQueryMap}
+        consumers={utilizationPopoverQueryMap(ocsCluster)}
         humanize={humanizeBinaryBytes}
       />
     ),
-    [t]
+    [t, ocsCluster]
   );
 
   return (
@@ -45,7 +55,9 @@ export const UtilizationContent: React.FC = () => {
       <PrometheusUtilizationItem
         title={t('Used capacity')}
         utilizationQuery={
-          UTILIZATION_QUERY[StorageDashboardQuery.CEPH_CAPACITY_USED]
+          UTILIZATION_QUERY(ocsCluster, ocsCluster)[
+            StorageDashboardQuery.CEPH_CAPACITY_USED
+          ]
         }
         humanizeValue={humanizeBinaryBytes}
         byteDataType={ByteDataTypes.BinaryBytes}
@@ -54,8 +66,12 @@ export const UtilizationContent: React.FC = () => {
       <PrometheusMultilineUtilizationItem
         title={t('IOPS')}
         queries={[
-          UTILIZATION_QUERY[StorageDashboardQuery.UTILIZATION_IOPS_READ_QUERY],
-          UTILIZATION_QUERY[StorageDashboardQuery.UTILIZATION_IOPS_WRITE_QUERY],
+          UTILIZATION_QUERY(ocsCluster)[
+            StorageDashboardQuery.UTILIZATION_IOPS_READ_QUERY
+          ],
+          UTILIZATION_QUERY(ocsCluster)[
+            StorageDashboardQuery.UTILIZATION_IOPS_WRITE_QUERY
+          ],
         ]}
         humanizeValue={humanizeIOPS}
         chartType="stacked-area"
@@ -63,10 +79,10 @@ export const UtilizationContent: React.FC = () => {
       <PrometheusMultilineUtilizationItem
         title={t('Throughput')}
         queries={[
-          UTILIZATION_QUERY[
+          UTILIZATION_QUERY(ocsCluster)[
             StorageDashboardQuery.UTILIZATION_THROUGHPUT_READ_QUERY
           ],
-          UTILIZATION_QUERY[
+          UTILIZATION_QUERY(ocsCluster)[
             StorageDashboardQuery.UTILIZATION_THROUGHPUT_WRITE_QUERY
           ],
         ]}
@@ -76,10 +92,10 @@ export const UtilizationContent: React.FC = () => {
       <PrometheusMultilineUtilizationItem
         title={t('Latency')}
         queries={[
-          UTILIZATION_QUERY[
+          UTILIZATION_QUERY(ocsCluster)[
             StorageDashboardQuery.UTILIZATION_LATENCY_READ_QUERY
           ],
-          UTILIZATION_QUERY[
+          UTILIZATION_QUERY(ocsCluster)[
             StorageDashboardQuery.UTILIZATION_LATENCY_WRITE_QUERY
           ],
         ]}
@@ -89,7 +105,7 @@ export const UtilizationContent: React.FC = () => {
       <PrometheusUtilizationItem
         title={t('Recovery')}
         utilizationQuery={
-          UTILIZATION_QUERY[
+          UTILIZATION_QUERY(ocsCluster)[
             StorageDashboardQuery.UTILIZATION_RECOVERY_RATE_QUERY
           ]
         }
diff --git a/packages/ocs/hooks/useOcsHealth.ts b/packages/ocs/hooks/useOcsHealth.ts
index ca356ff21..69dc25ec1 100644
--- a/packages/ocs/hooks/useOcsHealth.ts
+++ b/packages/ocs/hooks/useOcsHealth.ts
@@ -3,14 +3,16 @@ import {
   useCustomPrometheusPoll,
   usePrometheusBasePath,
 } from '@odf/shared/hooks/custom-prometheus-poll';
-import { K8sResourceKind } from '@odf/shared/types';
+import { getName, getNamespace } from '@odf/shared/selectors';
+import { K8sResourceKind, StorageSystemKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
-import { referenceForModel } from '@odf/shared/utils';
+import { referenceForModel, isOCSStorageSystem } from '@odf/shared/utils';
 import {
   HealthState,
   useK8sWatchResource,
   WatchK8sResource,
 } from '@openshift-console/dynamic-plugin-sdk';
+import * as _ from 'lodash-es';
 import {
   CephClusterModel,
   CephObjectStoreModel,
@@ -49,8 +51,21 @@ const AcceptableHealthStates = [
   NA,
 ];
 
-export const useGetOCSHealth = () => {
+type UnifiedHealthState = {
+  rawHealthState: string;
+  errorMessages?: string[];
+  errorComponent?: string;
+};
+
+type UnifiedHealthStates = {
+  [systemNameAndNamespace: string]: UnifiedHealthState;
+};
+
+type UseGetOCSHealth = (systems: StorageSystemKind[]) => UnifiedHealthStates;
+
+export const useGetOCSHealth: UseGetOCSHealth = (systems) => {
   const { t } = useCustomTranslation();
+
   const [cephData, cephLoaded, cephLoadError] =
     useK8sWatchResource<K8sResourceKind[]>(cephClusterResource);
   const [cephObjData, cephObjLoaded, cephObjLoadError] = useK8sWatchResource<
@@ -65,78 +80,126 @@ export const useGetOCSHealth = () => {
     basePath: usePrometheusBasePath(),
   });
 
-  const cephHealthState = getCephHealthState(
-    { ceph: { data: cephData, loaded: cephLoaded, loadError: cephLoadError } },
-    t
-  ).state;
-  const interimRGWState =
-    !cephObjLoadError && cephObjLoaded
-      ? getRGWHealthState(cephObjData[0]).state
-      : NA;
-
-  const interimMCGState = getNooBaaState(
-    [
-      {
-        response: noobaaHealthStatus,
-        error: noobaaQueryLoadError,
-      },
-    ],
+  return React.useMemo(() => {
+    let unifiedHealthStates: UnifiedHealthStates = {};
+    systems?.forEach((system: StorageSystemKind) => {
+      if (isOCSStorageSystem(system)) {
+        const systemName = getName(system);
+        const systemNamespace = getNamespace(system);
+
+        const cephCluster = cephData?.find(
+          (ceph) => getNamespace(ceph) === systemNamespace
+        );
+        const cephObjectStore = cephObjData?.find(
+          (cephObj) => getNamespace(cephObj) === systemNamespace
+        );
+        const noobaaCluster = noobaaData?.find(
+          (noobaa) => getNamespace(noobaa) === systemNamespace
+        );
+
+        const cephHealthState = getCephHealthState(
+          {
+            ceph: {
+              data: cephCluster,
+              loaded: cephLoaded,
+              loadError: cephLoadError,
+            },
+          },
+          t
+        ).state;
+
+        const interimRGWState =
+          !cephObjLoadError && cephObjLoaded
+            ? getRGWHealthState(cephObjectStore).state
+            : NA;
+
+        // there will only be single NooBaa instance (even for multiple StorageSystems)
+        // and its status should only be linked with the corresponding StorageSystem/StorageCluster.
+        const interimMCGState = !_.isEmpty(noobaaCluster)
+          ? getNooBaaState(
+              [
+                {
+                  response: noobaaHealthStatus,
+                  error: noobaaQueryLoadError,
+                },
+              ],
+              t,
+              {
+                loaded: noobaaLoaded,
+                loadError: noobaaLoadError,
+                data: noobaaData,
+              }
+            ).state
+          : NA;
+
+        const mcgState = AcceptableHealthStates.includes(interimMCGState)
+          ? HealthState.OK
+          : HealthState.ERROR;
+
+        const rgwState = AcceptableHealthStates.includes(interimRGWState)
+          ? HealthState.OK
+          : HealthState.ERROR;
+
+        const cephStorageHealthStatus = AcceptableHealthStates.includes(
+          cephHealthState
+        )
+          ? HealthState.OK
+          : HealthState.ERROR;
+
+        const unifiedObjectHealth =
+          mcgState === HealthState.ERROR || rgwState === HealthState.ERROR
+            ? HealthState.ERROR
+            : HealthState.OK;
+
+        let unifiedHealthState: UnifiedHealthState;
+        if (
+          unifiedObjectHealth === HealthState.ERROR &&
+          cephStorageHealthStatus === HealthState.ERROR
+        ) {
+          unifiedHealthState = {
+            rawHealthState: '2',
+            errorMessages: [
+              t('Block and File service is unhealthy'),
+              t('Object service is unhealthy'),
+            ],
+          };
+        } else if (unifiedObjectHealth === HealthState.ERROR) {
+          unifiedHealthState = {
+            rawHealthState: '1',
+            errorMessages: [t('Object service is unhealthy')],
+            errorComponent:
+              rgwState !== HealthState.OK ? 'block-file' : 'object',
+          };
+        } else if (cephStorageHealthStatus === HealthState.ERROR) {
+          unifiedHealthState = {
+            rawHealthState: '1',
+            errorMessages: [t('Block and File service is unhealthy')],
+            errorComponent: 'block-file',
+          };
+        } else {
+          unifiedHealthState = {
+            rawHealthState: '0',
+          };
+        }
+
+        unifiedHealthStates[systemName + systemNamespace] = unifiedHealthState;
+      }
+    });
+
+    return unifiedHealthStates;
+  }, [
+    systems,
+    cephData,
+    cephLoaded,
+    cephLoadError,
+    cephObjData,
+    cephObjLoaded,
+    cephObjLoadError,
+    noobaaData,
+    noobaaLoaded,
+    noobaaLoadError,
+    noobaaHealthStatus,
+    noobaaQueryLoadError,
     t,
-    {
-      loaded: noobaaLoaded,
-      loadError: noobaaLoadError,
-      data: noobaaData,
-    }
-  ).state;
-
-  const mcgState = AcceptableHealthStates.includes(interimMCGState)
-    ? HealthState.OK
-    : HealthState.ERROR;
-
-  const rgwState = AcceptableHealthStates.includes(interimRGWState)
-    ? HealthState.OK
-    : HealthState.ERROR;
-
-  const cephStorageHealthStatus = AcceptableHealthStates.includes(
-    cephHealthState
-  )
-    ? HealthState.OK
-    : HealthState.ERROR;
-
-  const unifiedObjectHealth =
-    mcgState === HealthState.ERROR || rgwState === HealthState.ERROR
-      ? HealthState.ERROR
-      : HealthState.OK;
-
-  const unifiedHealthState = React.useMemo(() => {
-    if (
-      unifiedObjectHealth === HealthState.ERROR &&
-      cephStorageHealthStatus === HealthState.ERROR
-    ) {
-      return {
-        rawHealthState: '2',
-        errorMessages: [
-          t('Block and File service is unhealthy'),
-          t('Object service is unhealthy'),
-        ],
-      };
-    } else if (unifiedObjectHealth === HealthState.ERROR) {
-      return {
-        rawHealthState: '1',
-        errorMessages: [t('Object service is unhealthy')],
-        errorComponent: rgwState !== HealthState.OK ? 'block-file' : 'object',
-      };
-    } else if (cephStorageHealthStatus === HealthState.ERROR) {
-      return {
-        rawHealthState: '1',
-        errorMessages: [t('Block and File service is unhealthy')],
-        errorComponent: 'block-file',
-      };
-    }
-    return {
-      rawHealthState: '0',
-    };
-  }, [unifiedObjectHealth, cephStorageHealthStatus, rgwState, t]);
-
-  return unifiedHealthState;
+  ]);
 };
diff --git a/packages/ocs/modals/block-pool/create-block-pool-modal.tsx b/packages/ocs/modals/block-pool/create-block-pool-modal.tsx
index 627623274..63929d5cb 100644
--- a/packages/ocs/modals/block-pool/create-block-pool-modal.tsx
+++ b/packages/ocs/modals/block-pool/create-block-pool-modal.tsx
@@ -1,7 +1,4 @@
 import * as React from 'react';
-import { useSafeK8sWatchResource } from '@odf/core/hooks';
-import { useODFNamespaceSelector } from '@odf/core/redux';
-import { K8sResourceObj } from '@odf/core/types';
 import { ONE_SECOND } from '@odf/shared/constants';
 import { ModalTitle, ModalFooter } from '@odf/shared/generic/ModalTitle';
 import {
@@ -9,10 +6,18 @@ import {
   withHandlePromise,
 } from '@odf/shared/generic/promise-component';
 import { ModalBody } from '@odf/shared/modals/Modal';
+import { getNamespace } from '@odf/shared/selectors';
 import { CephClusterKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
-import { referenceForModel } from '@odf/shared/utils';
-import { k8sCreate } from '@openshift-console/dynamic-plugin-sdk';
+import {
+  referenceForModel,
+  getValidWatchK8sResourceObj,
+} from '@odf/shared/utils';
+import {
+  k8sCreate,
+  useK8sWatchResource,
+  WatchK8sResource,
+} from '@openshift-console/dynamic-plugin-sdk';
 import { ModalComponent } from '@openshift-console/dynamic-plugin-sdk/lib/app/modal-support/ModalProvider';
 import { Modal } from '@patternfly/react-core';
 import { BlockPoolStatus, BlockPoolBody } from '../../block-pool/body';
@@ -28,12 +33,20 @@ import { StoragePoolKind } from '../../types';
 import { BlockPoolModalFooter, FooterPrimaryActions } from './modal-footer';
 import './create-block-pool-modal.scss';
 
+const poolResource = (poolName: string, ns: string): WatchK8sResource => ({
+  kind: referenceForModel(CephBlockPoolModel),
+  namespaced: true,
+  isList: false,
+  name: poolName,
+  namespace: ns,
+});
+
 export const CreateBlockPoolModal = withHandlePromise(
   (props: CreateBlockPoolModalProps) => {
     const { cephClusters, onPoolCreation, handlePromise, errorMessage } = props;
     const { t } = useCustomTranslation();
 
-    const { odfNamespace } = useODFNamespaceSelector();
+    const poolNs = getNamespace(cephClusters?.[0]);
 
     const [state, dispatch] = React.useReducer(
       blockPoolReducer,
@@ -48,19 +61,13 @@ export const CreateBlockPoolModal = withHandlePromise(
     const MODAL_TITLE = t('Create BlockPool');
 
     // Watch newly created pool after submit
-    const poolResource: K8sResourceObj = React.useCallback(
-      (ns) => ({
-        kind: referenceForModel(CephBlockPoolModel),
-        namespaced: true,
-        isList: false,
-        name: state.poolName,
-        namespace: ns,
-      }),
-      [state.poolName]
-    );
-
     const [newPool, newPoolLoaded, newPoolLoadError] =
-      useSafeK8sWatchResource<StoragePoolKind>(poolResource);
+      useK8sWatchResource<StoragePoolKind>(
+        getValidWatchK8sResourceObj(
+          poolResource(state.poolName, poolNs),
+          isSubmit && !!state.poolName
+        )
+      );
 
     React.useEffect(() => {
       if (isSubmit) {
@@ -117,7 +124,7 @@ export const CreateBlockPoolModal = withHandlePromise(
           type: BlockPoolActionType.SET_POOL_STATUS,
           payload: POOL_PROGRESS.PROGRESS,
         });
-        const poolObj: StoragePoolKind = getPoolKindObj(state, odfNamespace);
+        const poolObj: StoragePoolKind = getPoolKindObj(state, poolNs);
 
         handlePromise(
           k8sCreate({ model: CephBlockPoolModel, data: poolObj }),
@@ -163,7 +170,7 @@ export const CreateBlockPoolModal = withHandlePromise(
             </div>
           ) : (
             <BlockPoolBody
-              cephCluster={cephClusters[0]}
+              cephCluster={cephClusters?.[0]}
               state={state}
               dispatch={dispatch}
               showPoolStatus
diff --git a/packages/ocs/modals/block-pool/delete-block-pool-modal.tsx b/packages/ocs/modals/block-pool/delete-block-pool-modal.tsx
index 2a761fea6..28eb46090 100644
--- a/packages/ocs/modals/block-pool/delete-block-pool-modal.tsx
+++ b/packages/ocs/modals/block-pool/delete-block-pool-modal.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
 import { ModalFooter } from '@odf/shared/generic/ModalTitle';
 import { StatusBox } from '@odf/shared/generic/status-box';
-import { useDeepCompareMemoize } from '@odf/shared/hooks/deep-compare-memoize';
 import { useK8sGet } from '@odf/shared/hooks/k8s-get-hook';
 import {
   CommonModalProps,
@@ -12,18 +12,16 @@ import {
   PersistentVolumeClaimModel,
   StorageClassModel,
 } from '@odf/shared/models';
+import { getName, getNamespace } from '@odf/shared/selectors';
 import {
   ListKind,
   PersistentVolumeClaimKind,
   StorageClassResourceKind,
-  CephClusterKind,
 } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
-import { referenceForModel } from '@odf/shared/utils';
 import {
   k8sDelete,
   K8sKind,
-  useK8sWatchResource,
   YellowExclamationTriangleIcon,
 } from '@openshift-console/dynamic-plugin-sdk';
 import { Trans } from 'react-i18next';
@@ -36,18 +34,12 @@ import {
   blockPoolInitialState,
   blockPoolReducer,
 } from '../../block-pool/reducer';
-import { CEPH_EXTERNAL_CR_NAME, POOL_PROGRESS } from '../../constants';
-import { CephBlockPoolModel, CephClusterModel } from '../../models';
+import { POOL_PROGRESS } from '../../constants';
+import { CephBlockPoolModel } from '../../models';
 import { StoragePoolKind } from '../../types';
 import { getStorageClassName } from '../../utils/common';
 import { BlockPoolModalFooter, FooterPrimaryActions } from './modal-footer';
 
-const cephClusterResource = {
-  kind: referenceForModel(CephClusterModel),
-  namespaced: false,
-  isList: true,
-};
-
 export const toList = (text: string[]): React.ReactNode => (
   <div
     style={{
@@ -68,7 +60,8 @@ const DeleteBlockPoolModal: React.FC<DeleteBlockPoolModalProps> = (props) => {
     isOpen,
     closeModal,
   } = props;
-  const poolName = resource?.metadata.name;
+  const poolName = getName(resource);
+  const poolNamespace = getNamespace(resource);
 
   const [state, dispatch] = React.useReducer(
     blockPoolReducer,
@@ -77,22 +70,18 @@ const DeleteBlockPoolModal: React.FC<DeleteBlockPoolModalProps> = (props) => {
   const [scNames, setScNames] = React.useState<React.ReactNode>();
   const [inProgress, setProgress] = React.useState(false);
 
-  const [cephClusters, isLoaded, loadError] =
-    useK8sWatchResource<CephClusterKind[]>(cephClusterResource);
   const [scResources, scLoaded, scLoadError] =
     useK8sGet<ListKind<StorageClassResourceKind>>(StorageClassModel);
   const [pvcResources, pvcLoaded, pvcLoadError] = useK8sGet<
     ListKind<PersistentVolumeClaimKind>
   >(PersistentVolumeClaimModel);
-  const cephCluster: CephClusterKind = useDeepCompareMemoize(
-    cephClusters[0],
-    true
-  );
+
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const isExternalSC = systemFlags[poolNamespace]?.isExternalMode;
 
   React.useEffect(() => {
     // restrict pool management for default pool and external cluster
-    cephCluster?.metadata.name === CEPH_EXTERNAL_CR_NAME ||
-    isDefaultPool(resource)
+    isExternalSC || isDefaultPool(resource)
       ? dispatch({
           type: BlockPoolActionType.SET_POOL_STATUS,
           payload: POOL_PROGRESS.NOTALLOWED,
@@ -101,7 +90,7 @@ const DeleteBlockPoolModal: React.FC<DeleteBlockPoolModalProps> = (props) => {
           type: BlockPoolActionType.SET_POOL_NAME,
           payload: poolName,
         });
-  }, [resource, cephCluster, isLoaded, loadError, poolName]);
+  }, [resource, isExternalSC, poolName]);
 
   React.useEffect(() => {
     if (
@@ -172,10 +161,7 @@ const DeleteBlockPoolModal: React.FC<DeleteBlockPoolModalProps> = (props) => {
       variant={ModalVariant.small}
       onClose={closeModal}
     >
-      {isLoaded &&
-      pvcLoaded &&
-      scLoaded &&
-      !(loadError && pvcLoadError && scLoadError) ? (
+      {pvcLoaded && scLoaded && !(pvcLoadError && scLoadError) ? (
         <>
           <ModalBody>
             {state.poolStatus === POOL_PROGRESS.NOTALLOWED ? (
@@ -221,8 +207,8 @@ const DeleteBlockPoolModal: React.FC<DeleteBlockPoolModalProps> = (props) => {
         </>
       ) : (
         <StatusBox
-          loaded={isLoaded && pvcLoaded && scLoaded}
-          loadError={loadError ?? pvcLoadError ?? scLoadError}
+          loaded={pvcLoaded && scLoaded}
+          loadError={pvcLoadError ?? scLoadError}
           label={t('BlockPool Delete Modal')}
         />
       )}
diff --git a/packages/ocs/modals/block-pool/update-block-pool-modal.tsx b/packages/ocs/modals/block-pool/update-block-pool-modal.tsx
index c3803ef75..fd4d91a83 100644
--- a/packages/ocs/modals/block-pool/update-block-pool-modal.tsx
+++ b/packages/ocs/modals/block-pool/update-block-pool-modal.tsx
@@ -1,8 +1,10 @@
 import * as React from 'react';
+import { useODFSystemFlagsSelector } from '@odf/core/redux';
+import { getResourceInNs as getCephClusterInNs } from '@odf/core/utils';
 import { ModalFooter } from '@odf/shared/generic/ModalTitle';
 import { StatusBox } from '@odf/shared/generic/status-box';
-import { useDeepCompareMemoize } from '@odf/shared/hooks/deep-compare-memoize';
 import { CommonModalProps, ModalBody } from '@odf/shared/modals/Modal';
+import { getNamespace } from '@odf/shared/selectors';
 import { CephClusterKind } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { referenceForModel } from '@odf/shared/utils';
@@ -18,11 +20,7 @@ import {
   blockPoolInitialState,
   blockPoolReducer,
 } from '../../block-pool/reducer';
-import {
-  CEPH_EXTERNAL_CR_NAME,
-  COMPRESSION_ON,
-  POOL_PROGRESS,
-} from '../../constants';
+import { COMPRESSION_ON, POOL_PROGRESS } from '../../constants';
 import { CephBlockPoolModel, CephClusterModel } from '../../models';
 import { StoragePoolKind } from '../../types';
 import { isDefaultPool } from '../../utils';
@@ -35,7 +33,6 @@ type UpdateBlockPoolModalProps = CommonModalProps<{
 
 const cephClusterResource = {
   kind: referenceForModel(CephClusterModel),
-  namespaced: false,
   isList: true,
 };
 
@@ -46,6 +43,7 @@ const UpdateBlockPoolModal: React.FC<UpdateBlockPoolModalProps> = (props) => {
     closeModal,
     isOpen,
   } = props;
+  const poolNamespace = getNamespace(resource);
 
   const [state, dispatch] = React.useReducer(
     blockPoolReducer,
@@ -54,10 +52,12 @@ const UpdateBlockPoolModal: React.FC<UpdateBlockPoolModalProps> = (props) => {
   const [inProgress, setProgress] = React.useState(false);
   const [cephClusters, isLoaded, loadError] =
     useK8sWatchResource<CephClusterKind[]>(cephClusterResource);
-  const cephCluster: CephClusterKind = useDeepCompareMemoize(
-    cephClusters[0],
-    true
-  );
+
+  // only single cluster per Namespace
+  const cephCluster = getCephClusterInNs(
+    cephClusters,
+    poolNamespace
+  ) as CephClusterKind;
 
   const MODAL_TITLE = t('Edit BlockPool');
   const MODAL_DESC = t(
@@ -82,16 +82,18 @@ const UpdateBlockPoolModal: React.FC<UpdateBlockPoolModalProps> = (props) => {
     [dispatch]
   );
 
+  const { systemFlags } = useODFSystemFlagsSelector();
+  const isExternalSC = systemFlags[poolNamespace]?.isExternalMode;
+
   React.useEffect(() => {
     // restrict pool management for default pool and external cluster
-    cephCluster?.metadata.name === CEPH_EXTERNAL_CR_NAME ||
-    isDefaultPool(resource)
+    isExternalSC || isDefaultPool(resource)
       ? dispatch({
           type: BlockPoolActionType.SET_POOL_STATUS,
           payload: POOL_PROGRESS.NOTALLOWED,
         })
       : populateBlockPoolData(resource);
-  }, [resource, cephCluster, populateBlockPoolData]);
+  }, [resource, isExternalSC, populateBlockPoolData]);
 
   // Update block pool
   const updatePool = () => {
diff --git a/packages/ocs/queries/ceph-storage.spec.ts b/packages/ocs/queries/ceph-storage.spec.ts
index ee995b486..f46e729f5 100644
--- a/packages/ocs/queries/ceph-storage.spec.ts
+++ b/packages/ocs/queries/ceph-storage.spec.ts
@@ -14,41 +14,47 @@ describe('tests for get breakdown metrics query', () => {
   it('should return correct query for PVCS', () => {
     const metricType = BreakdownCardFieldsWithParams.PVCS;
     const namespace = 'example-namespace';
-    const result = getBreakdownMetricsQuery(metricType, namespace);
+    const scPrefix = 'test-prefix';
+    const result = getBreakdownMetricsQuery(metricType, scPrefix, namespace);
 
     expect(result).toEqual({
       model: PersistentVolumeClaimModel,
       metric: 'persistentvolumeclaim',
-      queries: getPVCNamespaceQuery(namespace),
+      queries: getPVCNamespaceQuery(namespace, scPrefix),
     });
   });
 
   it('should return correct query for other metric types', () => {
     const metricType = BreakdownCardFields.PODS;
-    const result = getBreakdownMetricsQuery(metricType);
+    const scPrefix = 'test-prefix';
+    const result = getBreakdownMetricsQuery(metricType, scPrefix);
 
-    expect(result).toEqual(breakdownQueryMapCEPH[metricType]);
+    expect(result).toEqual(
+      breakdownQueryMapCEPH(scPrefix, scPrefix)[metricType]
+    );
   });
 });
 
 describe('tests for get pvc namespace query method', () => {
   it('should return queries with an empty namespace', () => {
     const namespace = '';
-    const result = getPVCNamespaceQuery(namespace);
+    const scPrefix = 'test-prefix';
+    const result = getPVCNamespaceQuery(namespace, scPrefix);
 
     expect(result).toEqual({
-      [StorageDashboardQuery.PVC_NAMESPACES_BY_USED]: `sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"}))`,
-      [StorageDashboardQuery.PVC_NAMESPACES_TOTAL_USED]: `sum(sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"})))`,
+      [StorageDashboardQuery.PVC_NAMESPACES_BY_USED]: `sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(.*ceph.rook.io/block)",storageclass=~"${scPrefix}.*"}))`,
+      [StorageDashboardQuery.PVC_NAMESPACES_TOTAL_USED]: `sum(sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(.*ceph.rook.io/block)",storageclass=~"${scPrefix}.*"})))`,
     });
   });
 
   it('should return queries with a non-empty namespace', () => {
     const namespace = 'example-namespace';
-    const result = getPVCNamespaceQuery(namespace);
+    const scPrefix = 'test-prefix';
+    const result = getPVCNamespaceQuery(namespace, scPrefix);
 
     expect(result).toEqual({
-      [StorageDashboardQuery.PVC_NAMESPACES_BY_USED]: `sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"}))`,
-      [StorageDashboardQuery.PVC_NAMESPACES_TOTAL_USED]: `sum(sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"})))`,
+      [StorageDashboardQuery.PVC_NAMESPACES_BY_USED]: `sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(.*ceph.rook.io/block)",storageclass=~"${scPrefix}.*"}))`,
+      [StorageDashboardQuery.PVC_NAMESPACES_TOTAL_USED]: `sum(sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(.*ceph.rook.io/block)",storageclass=~"${scPrefix}.*"})))`,
     });
   });
 });
diff --git a/packages/ocs/queries/ceph-storage.ts b/packages/ocs/queries/ceph-storage.ts
index f3a466585..da7c39c84 100644
--- a/packages/ocs/queries/ceph-storage.ts
+++ b/packages/ocs/queries/ceph-storage.ts
@@ -50,45 +50,48 @@ export enum StorageDashboardQuery {
   POOL_UTILIZATION_THROUGHPUT_QUERY = 'POOL_UTILIZATION_THROUGHPUT_QUERY',
 }
 
-export const DATA_RESILIENCY_QUERY = {
-  [StorageDashboardQuery.RESILIENCY_PROGRESS]:
-    '(ceph_pg_clean and ceph_pg_active)/ceph_pg_total',
-};
+// ToDo (epic 4422): This should work (for now) as "managedBy" will be unique,
+// but moving forward add a label to metric for CephCluster namespace and use that instead (update query).
+export const DATA_RESILIENCY_QUERY = (managedByOCS: string) => ({
+  [StorageDashboardQuery.RESILIENCY_PROGRESS]: `(ceph_pg_clean{managedBy="${managedByOCS}"} and ceph_pg_active{managedBy="${managedByOCS}"})/ceph_pg_total{managedBy="${managedByOCS}"}`,
+});
 
-export const CEPH_CAPACITY_BREAKDOWN_QUERIES = {
-  [StorageDashboardQuery.PROJECTS_TOTAL_USED]:
-    'sum(sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"})) by (namespace))',
-  [StorageDashboardQuery.PROJECTS_BY_USED]:
-    'sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"})) by (namespace)',
-  [StorageDashboardQuery.STORAGE_CLASSES_TOTAL_USED]:
-    'sum(sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"})) by (storageclass, provisioner))',
-  [StorageDashboardQuery.STORAGE_CLASSES_BY_USED]:
-    'sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"})) by (storageclass, provisioner)',
-  [StorageDashboardQuery.PODS_TOTAL_USED]:
-    'sum (((max by(namespace,persistentvolumeclaim) (kubelet_volume_stats_used_bytes)) * on (namespace,persistentvolumeclaim) group_right() ((kube_running_pod_ready*0+1) * on(namespace, pod)  group_right() kube_pod_spec_volumes_persistentvolumeclaims_info)) * on(namespace,persistentvolumeclaim) group_left(provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"}))',
-  [StorageDashboardQuery.PODS_BY_USED]:
-    'sum by(namespace,pod) (((max by(namespace,persistentvolumeclaim) (kubelet_volume_stats_used_bytes)) * on (namespace,persistentvolumeclaim) group_right() ((kube_running_pod_ready*0+1) * on(namespace, pod)  group_right() kube_pod_spec_volumes_persistentvolumeclaims_info)) * on(namespace,persistentvolumeclaim) group_left(provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"}))',
-  [StorageDashboardQuery.CEPH_CAPACITY_TOTAL]: 'ceph_cluster_total_bytes',
-  [StorageDashboardQuery.CEPH_CAPACITY_USED]:
-    'sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)"}))',
-  [StorageDashboardQuery.CEPH_CAPACITY_AVAILABLE]:
-    'max(ceph_pool_max_avail * on (pool_id) group_left(name)ceph_pool_metadata{name=~"(.*file.*)|(.*block.*)"})',
-};
+// ToDo (epic 4422): This should work (for now) as "managedBy" will be unique,
+// but moving forward add a label to metric for CephCluster namespace and use that instead (update query).
+export const CEPH_CAPACITY_BREAKDOWN_QUERIES = (
+  storageClassNamePrefix: string,
+  managedByOCS?: string
+) => ({
+  [StorageDashboardQuery.PROJECTS_TOTAL_USED]: `sum(sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)",storageclass=~"${storageClassNamePrefix}.*"})) by (namespace))`,
+  [StorageDashboardQuery.PROJECTS_BY_USED]: `sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)",storageclass=~"${storageClassNamePrefix}.*"})) by (namespace)`,
+  [StorageDashboardQuery.STORAGE_CLASSES_TOTAL_USED]: `sum(sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)",storageclass=~"${storageClassNamePrefix}.*"})) by (storageclass, provisioner))`,
+  [StorageDashboardQuery.STORAGE_CLASSES_BY_USED]: `sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)",storageclass=~"${storageClassNamePrefix}.*"})) by (storageclass, provisioner)`,
+  [StorageDashboardQuery.PODS_TOTAL_USED]: `sum (((max by(namespace,persistentvolumeclaim) (kubelet_volume_stats_used_bytes)) * on (namespace,persistentvolumeclaim) group_right() ((kube_running_pod_ready*0+1) * on(namespace, pod)  group_right() kube_pod_spec_volumes_persistentvolumeclaims_info)) * on(namespace,persistentvolumeclaim) group_left(provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)",storageclass=~"${storageClassNamePrefix}.*"}))`,
+  [StorageDashboardQuery.PODS_BY_USED]: `sum by(namespace,pod) (((max by(namespace,persistentvolumeclaim) (kubelet_volume_stats_used_bytes)) * on (namespace,persistentvolumeclaim) group_right() ((kube_running_pod_ready*0+1) * on(namespace, pod)  group_right() kube_pod_spec_volumes_persistentvolumeclaims_info)) * on(namespace,persistentvolumeclaim) group_left(provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)",storageclass=~"${storageClassNamePrefix}.*"}))`,
+  [StorageDashboardQuery.CEPH_CAPACITY_TOTAL]: `ceph_cluster_total_bytes{managedBy="${managedByOCS}"}`,
+  [StorageDashboardQuery.CEPH_CAPACITY_USED]: `sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)",storageclass=~"${storageClassNamePrefix}.*"}))`,
+  [StorageDashboardQuery.CEPH_CAPACITY_AVAILABLE]: `max(ceph_pool_max_avail{managedBy="${managedByOCS}"} * on (pool_id) group_left(name)ceph_pool_metadata{name=~"(.*file.*)|(.*block.*)",managedBy="${managedByOCS}"})`,
+});
 
-export const breakdownQueryMapCEPH: BreakdownCardQueryMap = {
+export const breakdownQueryMapCEPH = (
+  storageClassNamePrefix: string,
+  managedByOCS: string
+): BreakdownCardQueryMap => ({
   [BreakdownCardFields.PROJECTS]: {
     model: ProjectModel,
     metric: 'namespace',
     queries: {
       [StorageDashboardQuery.PROJECTS_BY_USED]: `(topk(6,(${
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[StorageDashboardQuery.PROJECTS_BY_USED]
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix, managedByOCS)[
+          StorageDashboardQuery.PROJECTS_BY_USED
+        ]
       })))`,
       [StorageDashboardQuery.PROJECTS_TOTAL_USED]:
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix, managedByOCS)[
           StorageDashboardQuery.PROJECTS_TOTAL_USED
         ],
       [StorageDashboardQuery.CEPH_CAPACITY_USED]:
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix, managedByOCS)[
           StorageDashboardQuery.CEPH_CAPACITY_USED
         ],
     },
@@ -98,16 +101,16 @@ export const breakdownQueryMapCEPH: BreakdownCardQueryMap = {
     metric: 'storageclass',
     queries: {
       [StorageDashboardQuery.STORAGE_CLASSES_BY_USED]: `(topk(6,(${
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix, managedByOCS)[
           StorageDashboardQuery.STORAGE_CLASSES_BY_USED
         ]
       })))`,
       [StorageDashboardQuery.STORAGE_CLASSES_TOTAL_USED]:
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix, managedByOCS)[
           StorageDashboardQuery.STORAGE_CLASSES_TOTAL_USED
         ],
       [StorageDashboardQuery.CEPH_CAPACITY_USED]:
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix, managedByOCS)[
           StorageDashboardQuery.CEPH_CAPACITY_USED
         ],
     },
@@ -117,92 +120,104 @@ export const breakdownQueryMapCEPH: BreakdownCardQueryMap = {
     metric: 'pod',
     queries: {
       [StorageDashboardQuery.PODS_BY_USED]: `(topk(6,(${
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[StorageDashboardQuery.PODS_BY_USED]
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix, managedByOCS)[
+          StorageDashboardQuery.PODS_BY_USED
+        ]
       })))`,
-      [StorageDashboardQuery.PODS_TOTAL_USED]:
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[StorageDashboardQuery.PODS_TOTAL_USED],
+      [StorageDashboardQuery.PODS_TOTAL_USED]: CEPH_CAPACITY_BREAKDOWN_QUERIES(
+        storageClassNamePrefix,
+        managedByOCS
+      )[StorageDashboardQuery.PODS_TOTAL_USED],
       [StorageDashboardQuery.CEPH_CAPACITY_USED]:
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix, managedByOCS)[
           StorageDashboardQuery.CEPH_CAPACITY_USED
         ],
     },
   },
-};
+});
 
 export const getBreakdownMetricsQuery = (
   metricType: BreakdownCardFieldsWithParams | BreakdownCardFields,
+  storageClassNamePrefix: string,
   namespace?: string,
-  isExternal?: boolean
+  isExternal?: boolean,
+  managedByOCS?: string
 ): BreakdownCardFieldsValues => {
   if (metricType === BreakdownCardFieldsWithParams.PVCS) {
     return {
       model: PersistentVolumeClaimModel,
       metric: 'persistentvolumeclaim',
-      queries: getPVCNamespaceQuery(namespace),
+      queries: getPVCNamespaceQuery(namespace, storageClassNamePrefix),
     };
   }
   return !isExternal
-    ? breakdownQueryMapCEPH[metricType]
-    : breakdownIndependentQueryMap[metricType];
+    ? breakdownQueryMapCEPH(storageClassNamePrefix, managedByOCS)[metricType]
+    : breakdownIndependentQueryMap(storageClassNamePrefix)[metricType];
 };
 
-export const CAPACITY_INFO_QUERIES = {
-  [StorageDashboardQuery.RAW_CAPACITY_TOTAL]: 'ceph_cluster_total_bytes',
-  [StorageDashboardQuery.RAW_CAPACITY_USED]:
-    'ceph_cluster_total_used_raw_bytes',
-};
+// ToDo (epic 4422): This should work (for now) as "managedBy" will be unique,
+// but moving forward add a label to metric for CephCluster namespace and use that instead (update query).
+export const CAPACITY_INFO_QUERIES = (managedByOCS: string) => ({
+  [StorageDashboardQuery.RAW_CAPACITY_TOTAL]: `ceph_cluster_total_bytes{managedBy="${managedByOCS}"}`,
+  [StorageDashboardQuery.RAW_CAPACITY_USED]: `ceph_cluster_total_used_raw_bytes{managedBy="${managedByOCS}"}`,
+});
 
-export const POOL_STORAGE_EFFICIENCY_QUERIES = {
-  [StorageDashboardQuery.POOL_CAPACITY_RATIO]:
-    'sum(ceph_bluestore_bluestore_compressed_original) / clamp_min(sum(ceph_bluestore_bluestore_compressed_allocated),1)',
-  [StorageDashboardQuery.POOL_SAVED_CAPACITY]:
-    '(sum(ceph_bluestore_bluestore_compressed_original) - sum(ceph_bluestore_bluestore_compressed_allocated))',
-};
+// ToDo (epic 4422): This should work (for now) as "managedBy" will be unique,
+// but moving forward add a label to metric for CephCluster namespace and use that instead (update query).
+export const POOL_STORAGE_EFFICIENCY_QUERIES = (managedByOCS: string) => ({
+  [StorageDashboardQuery.POOL_CAPACITY_RATIO]: `sum(ceph_bluestore_bluestore_compressed_original{managedBy="${managedByOCS}"}) / clamp_min(sum(ceph_bluestore_bluestore_compressed_allocated{managedBy="${managedByOCS}"}),1)`,
+  [StorageDashboardQuery.POOL_SAVED_CAPACITY]: `(sum(ceph_bluestore_bluestore_compressed_original{managedBy="${managedByOCS}"}) - sum(ceph_bluestore_bluestore_compressed_allocated{managedBy="${managedByOCS}"}))`,
+});
 
-export const UTILIZATION_QUERY = {
-  [StorageDashboardQuery.CEPH_CAPACITY_USED]:
-    'sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)"}))',
+// ToDo (epic 4422): This should work (for now) as "managedBy" will be unique,
+// but moving forward add a label to metric for CephCluster namespace and use that instead (update query).
+export const UTILIZATION_QUERY = (
+  managedByOCS: string,
+  storageClassNamePrefix?: string
+) => ({
+  [StorageDashboardQuery.CEPH_CAPACITY_USED]: `sum(topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)",storageclass=~"${storageClassNamePrefix}.*"}))`,
   [StorageDashboardQuery.UTILIZATION_IOPS_READ_QUERY]: {
-    query: 'sum(rate(ceph_pool_rd[1m]))',
+    query: `sum(rate(ceph_pool_rd{managedBy="${managedByOCS}"}[1m]))`,
     desc: 'Reads',
   },
   [StorageDashboardQuery.UTILIZATION_IOPS_WRITE_QUERY]: {
-    query: 'sum(rate(ceph_pool_wr[1m]))',
+    query: `sum(rate(ceph_pool_wr{managedBy="${managedByOCS}"}[1m]))`,
     desc: 'Writes',
   },
   [StorageDashboardQuery.UTILIZATION_LATENCY_READ_QUERY]: {
-    query: 'cluster:ceph_disk_latency_read:join_ceph_node_disk_rate1m',
+    query: `cluster:ceph_disk_latency_read:join_ceph_node_disk_rate1m{managedBy="${managedByOCS}"}`,
     desc: 'Reads',
   },
   [StorageDashboardQuery.UTILIZATION_LATENCY_WRITE_QUERY]: {
-    query: 'cluster:ceph_disk_latency_write:join_ceph_node_disk_rate1m',
+    query: `cluster:ceph_disk_latency_write:join_ceph_node_disk_rate1m{managedBy="${managedByOCS}"}`,
     desc: 'Writes',
   },
   [StorageDashboardQuery.UTILIZATION_THROUGHPUT_READ_QUERY]: {
-    query: 'sum(rate(ceph_pool_rd_bytes[1m]))',
+    query: `sum(rate(ceph_pool_rd_bytes{managedBy="${managedByOCS}"}[1m]))`,
     desc: 'Reads',
   },
   [StorageDashboardQuery.UTILIZATION_THROUGHPUT_WRITE_QUERY]: {
-    query: 'sum(rate(ceph_pool_wr_bytes[1m]))',
+    query: `sum(rate(ceph_pool_wr_bytes{managedBy="${managedByOCS}"}[1m]))`,
     desc: 'Writes',
   },
-  [StorageDashboardQuery.UTILIZATION_RECOVERY_RATE_QUERY]:
-    '(sum(ceph_pool_recovering_bytes_per_sec))',
-};
+  [StorageDashboardQuery.UTILIZATION_RECOVERY_RATE_QUERY]: `(sum(ceph_pool_recovering_bytes_per_sec{managedBy="${managedByOCS}"}))`,
+});
 
-export const utilizationPopoverQueryMap = [
+export const utilizationPopoverQueryMap = (storageClassNamePrefix: string) => [
   {
     model: ProjectModel,
     metric: 'namespace',
     query: `(sort_desc(topk(25,(${
-      CEPH_CAPACITY_BREAKDOWN_QUERIES[StorageDashboardQuery.PROJECTS_BY_USED]
+      CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix)[
+        StorageDashboardQuery.PROJECTS_BY_USED
+      ]
     }))))`,
   },
   {
     model: StorageClassModel,
     metric: 'storageclass',
     query: `(sort_desc(topk(25,(${
-      CEPH_CAPACITY_BREAKDOWN_QUERIES[
+      CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix)[
         StorageDashboardQuery.STORAGE_CLASSES_BY_USED
       ]
     }))))`,
@@ -211,53 +226,65 @@ export const utilizationPopoverQueryMap = [
     model: PodModel,
     metric: 'pod',
     query: `(sort_desc(topk(25, (${
-      CEPH_CAPACITY_BREAKDOWN_QUERIES[StorageDashboardQuery.PODS_BY_USED]
+      CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix)[
+        StorageDashboardQuery.PODS_BY_USED
+      ]
     }))))`,
   },
 ];
 
-export const getPVCNamespaceQuery = (namespace: string = '') => {
+export const getPVCNamespaceQuery = (
+  namespace: string = '',
+  storageClassNamePrefix: string
+) => {
   const queries = {
-    [StorageDashboardQuery.PVC_NAMESPACES_BY_USED]: `sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"}))`,
-    [StorageDashboardQuery.PVC_NAMESPACES_TOTAL_USED]: `sum(sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"})))`,
+    [StorageDashboardQuery.PVC_NAMESPACES_BY_USED]: `sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(.*ceph.rook.io/block)",storageclass=~"${storageClassNamePrefix}.*"}))`,
+    [StorageDashboardQuery.PVC_NAMESPACES_TOTAL_USED]: `sum(sum by (namespace, persistentvolumeclaim) (kubelet_volume_stats_used_bytes{namespace='${namespace}'} * on (namespace, persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass) group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(.*ceph.rook.io/block)",storageclass=~"${storageClassNamePrefix}.*"})))`,
   };
   return queries;
 };
 
+// ToDo (epic 4422): This should work (for now) as "managedBy" will be unique,
+// but moving forward add a label to metric for CephCluster namespace and use that instead (update query).
 export const getPoolQuery = (
   poolNames: string[],
-  queryName: StorageDashboardQuery
+  queryName: StorageDashboardQuery,
+  managedByOCS: string
 ) => {
   const names = poolNames.join('|');
   const queries = {
-    [StorageDashboardQuery.POOL_RAW_CAPACITY_USED]: `ceph_pool_bytes_used * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}'}`,
-    [StorageDashboardQuery.POOL_MAX_CAPACITY_AVAILABLE]: `ceph_pool_max_avail * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}'}`,
-    [StorageDashboardQuery.POOL_UTILIZATION_IOPS_QUERY]: `(rate(ceph_pool_wr[1m]) + rate(ceph_pool_rd[1m])) * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}'}`,
-    [StorageDashboardQuery.POOL_UTILIZATION_THROUGHPUT_QUERY]: `(rate(ceph_pool_wr_bytes[1m]) + rate(ceph_pool_rd_bytes[1m])) * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}'}`,
-    [StorageDashboardQuery.POOL_COMPRESSION_SAVINGS]: `(ceph_pool_compress_under_bytes - ceph_pool_compress_bytes_used) * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}'}`,
-    [StorageDashboardQuery.POOL_COMPRESSION_ELIGIBILITY]: `(((ceph_pool_compress_under_bytes > 0) / ceph_pool_stored_raw) * 100) * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}'}`,
-    [StorageDashboardQuery.POOL_COMPRESSION_RATIO]: `((ceph_pool_compress_under_bytes / ceph_pool_compress_bytes_used > 0) and on(pool_id) (((ceph_pool_compress_under_bytes > 0) / ceph_pool_stored_raw) * 100 > 0.5)) * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}'}`,
+    [StorageDashboardQuery.POOL_RAW_CAPACITY_USED]: `ceph_pool_bytes_used{managedBy='${managedByOCS}'} * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}',managedBy='${managedByOCS}'}`,
+    [StorageDashboardQuery.POOL_MAX_CAPACITY_AVAILABLE]: `ceph_pool_max_avail{managedBy='${managedByOCS}'} * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}',managedBy='${managedByOCS}'}`,
+    [StorageDashboardQuery.POOL_UTILIZATION_IOPS_QUERY]: `(rate(ceph_pool_wr{managedBy='${managedByOCS}'}[1m]) + rate(ceph_pool_rd{managedBy='${managedByOCS}'}[1m])) * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}',managedBy='${managedByOCS}'}`,
+    [StorageDashboardQuery.POOL_UTILIZATION_THROUGHPUT_QUERY]: `(rate(ceph_pool_wr_bytes{managedBy='${managedByOCS}'}[1m]) + rate(ceph_pool_rd_bytes{managedBy='${managedByOCS}'}[1m])) * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}',managedBy='${managedByOCS}'}`,
+    [StorageDashboardQuery.POOL_COMPRESSION_SAVINGS]: `(ceph_pool_compress_under_bytes{managedBy='${managedByOCS}'} - ceph_pool_compress_bytes_used{managedBy='${managedByOCS}'}) * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}',managedBy='${managedByOCS}'}`,
+    [StorageDashboardQuery.POOL_COMPRESSION_ELIGIBILITY]: `(((ceph_pool_compress_under_bytes{managedBy='${managedByOCS}'} > 0) / ceph_pool_stored_raw{managedBy='${managedByOCS}'}) * 100) * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}',managedBy='${managedByOCS}'}`,
+    [StorageDashboardQuery.POOL_COMPRESSION_RATIO]: `((ceph_pool_compress_under_bytes{managedBy='${managedByOCS}'} / ceph_pool_compress_bytes_used{managedBy='${managedByOCS}'} > 0) and on(pool_id) (((ceph_pool_compress_under_bytes{managedBy='${managedByOCS}'} > 0) / ceph_pool_stored_raw{managedBy='${managedByOCS}'}) * 100 > 0.5)) * on (pool_id) group_left(name)ceph_pool_metadata{name=~'${names}',managedBy='${managedByOCS}'}`,
   };
   return queries[queryName];
 };
 
-export const INDEPENDENT_UTILIZATION_QUERIES = {
-  [StorageDashboardQuery.REQUESTED_CAPACITY]:
-    'sum((kube_persistentvolumeclaim_resource_requests_storage_bytes * on (namespace,persistentvolumeclaim) group_right() kube_pod_spec_volumes_persistentvolumeclaims_info) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"}))',
-  [StorageDashboardQuery.USED_CAPACITY]:
-    'sum((topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_right() kube_pod_spec_volumes_persistentvolumeclaims_info) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)"}))',
-};
+export const INDEPENDENT_UTILIZATION_QUERIES = (
+  storageClassNamePrefix: string
+) => ({
+  [StorageDashboardQuery.REQUESTED_CAPACITY]: `sum((kube_persistentvolumeclaim_resource_requests_storage_bytes * on (namespace,persistentvolumeclaim) group_right() kube_pod_spec_volumes_persistentvolumeclaims_info) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)",storageclass=~"${storageClassNamePrefix}.*"}))`,
+  [StorageDashboardQuery.USED_CAPACITY]: `sum((topk by (namespace,persistentvolumeclaim) (1, kubelet_volume_stats_used_bytes) * on (namespace,persistentvolumeclaim) group_right() kube_pod_spec_volumes_persistentvolumeclaims_info) * on (namespace,persistentvolumeclaim) group_left(storageclass, provisioner) (kube_persistentvolumeclaim_info * on (storageclass)  group_left(provisioner) kube_storageclass_info {provisioner=~"(.*rbd.csi.ceph.com)|(.*cephfs.csi.ceph.com)|(ceph.rook.io/block)",storageclass=~"${storageClassNamePrefix}.*"}))`,
+});
 
-export const breakdownIndependentQueryMap: BreakdownCardQueryMap = {
+export const breakdownIndependentQueryMap = (
+  storageClassNamePrefix: string
+): BreakdownCardQueryMap => ({
   [BreakdownCardFields.PROJECTS]: {
     model: ProjectModel,
     metric: 'namespace',
     queries: {
       [StorageDashboardQuery.PROJECTS_BY_USED]: `(topk(6,(${
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[StorageDashboardQuery.PROJECTS_BY_USED]
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix)[
+          StorageDashboardQuery.PROJECTS_BY_USED
+        ]
       })))`,
       [StorageDashboardQuery.PROJECTS_TOTAL_USED]:
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix)[
           StorageDashboardQuery.PROJECTS_TOTAL_USED
         ],
     },
@@ -267,12 +294,12 @@ export const breakdownIndependentQueryMap: BreakdownCardQueryMap = {
     metric: 'storageclass',
     queries: {
       [StorageDashboardQuery.STORAGE_CLASSES_BY_USED]: `(topk(6,(${
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix)[
           StorageDashboardQuery.STORAGE_CLASSES_BY_USED
         ]
       })))`,
       [StorageDashboardQuery.STORAGE_CLASSES_TOTAL_USED]:
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix)[
           StorageDashboardQuery.STORAGE_CLASSES_TOTAL_USED
         ],
     },
@@ -282,10 +309,13 @@ export const breakdownIndependentQueryMap: BreakdownCardQueryMap = {
     metric: 'pod',
     queries: {
       [StorageDashboardQuery.PODS_BY_USED]: `(topk(6,(${
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[StorageDashboardQuery.PODS_BY_USED]
+        CEPH_CAPACITY_BREAKDOWN_QUERIES(storageClassNamePrefix)[
+          StorageDashboardQuery.PODS_BY_USED
+        ]
       })))`,
-      [StorageDashboardQuery.PODS_TOTAL_USED]:
-        CEPH_CAPACITY_BREAKDOWN_QUERIES[StorageDashboardQuery.PODS_TOTAL_USED],
+      [StorageDashboardQuery.PODS_TOTAL_USED]: CEPH_CAPACITY_BREAKDOWN_QUERIES(
+        storageClassNamePrefix
+      )[StorageDashboardQuery.PODS_TOTAL_USED],
     },
   },
-};
+});
diff --git a/packages/ocs/queries/object-storage.ts b/packages/ocs/queries/object-storage.ts
index 3f1aaa43a..2c6e9ad00 100644
--- a/packages/ocs/queries/object-storage.ts
+++ b/packages/ocs/queries/object-storage.ts
@@ -37,22 +37,28 @@ export enum ObjectServiceDashboardQuery {
   RGW_REBUILD_PROGRESS_QUERY = 'RGW_REBUILD_PROGRESS_QUERY',
 }
 
+// ToDo (epic 4422): This should work (for now) as "managedBy" will be unique,
+// but moving forward add a label to metric for CephCluster namespace and use that instead (update query).
 export const dataResiliencyQueryMap = {
   [ObjectServiceDashboardQuery.MCG_REBUILD_PROGRESS_QUERY]:
     'NooBaa_rebuild_progress/100',
   [ObjectServiceDashboardQuery.MCG_REBUILD_TIME_QUERY]: 'NooBaa_rebuild_time',
   [ObjectServiceDashboardQuery.RGW_REBUILD_PROGRESS_QUERY]: (
-    rgwPrefix: string = ''
+    rgwPrefix: string = '',
+    managedByOCS: string
   ) =>
     _.template(
-      'sum(ceph_pool_metadata{name=~"<%= name %>"}*on (job, namespace, pool_id) group_right(name) (ceph_pg_active and ceph_pg_clean)) / sum(ceph_pool_metadata{name=~"<%= name %>"} *on (job, namespace, pool_id) group_right(name) ceph_pg_total)'
+      'sum(ceph_pool_metadata{name=~"<%= name %>",managedBy="<%= managedByOCS %>"}*on (job, namespace, pool_id) group_right(name) (ceph_pg_active{managedBy="<%= managedByOCS %>"} and ceph_pg_clean{managedBy="<%= managedByOCS %>"})) / sum(ceph_pool_metadata{name=~"<%= name %>",managedBy="<%= managedByOCS %>"} *on (job, namespace, pool_id) group_right(name) ceph_pg_total{managedBy="<%= managedByOCS %>"})'
     )({
       name: rgwPrefix
         ? `${rgwPrefix}.rgw.*`
-        : '(ocs-storagecluster-cephblockpool)|(ocs-storagecluster-cephfilesystem-data0)',
+        : `(${managedByOCS}-cephblockpool)|(${managedByOCS}-cephfilesystem-data0)`,
+      managedByOCS: managedByOCS,
     }),
 };
 
+// ToDo (epic 4422): This should work (for now) as "managedBy" will be unique,
+// but moving forward add a label to metric for CephCluster namespace and use that instead (update query).
 export const MCG_CAPACITY_BREAKDOWN_QUERIES = {
   [ObjectServiceDashboardQuery.PROJECTS_BY_USED]:
     'NooBaa_projects_capacity_usage',
@@ -60,17 +66,22 @@ export const MCG_CAPACITY_BREAKDOWN_QUERIES = {
     'NooBaa_bucket_class_capacity_usage',
   [ObjectServiceDashboardQuery.NOOBAA_TOTAL_USED]:
     'sum(NooBaa_providers_physical_size)',
-  [ObjectServiceDashboardQuery.RGW_TOTAL_USED]: (rgwPrefix: string = '') =>
+  [ObjectServiceDashboardQuery.RGW_TOTAL_USED]: (
+    rgwPrefix: string = '',
+    managedByOCS: string
+  ) =>
     _.template(
-      'sum(ceph_pool_metadata{name=~"<%= name %>rgw.buckets.data"} *on (job, namespace, pool_id) group_right(name) ceph_pool_stored) - max(NooBaa_providers_physical_size{type="S3_COMPATIBLE"} or vector(0))'
-    )({ name: rgwPrefix ? `${rgwPrefix}.` : '.*' }),
+      'sum(ceph_pool_metadata{name=~"<%= name %>rgw.buckets.data",managedBy="<%= managedByOCS %>"} *on (job, namespace, pool_id) group_right(name) ceph_pool_stored{managedBy="<%= managedByOCS %>"}) - max(NooBaa_providers_physical_size{type="S3_COMPATIBLE"} or vector(0))'
+    )({ name: rgwPrefix ? `${rgwPrefix}.` : '.*', managedByOCS: managedByOCS }),
   [ObjectServiceDashboardQuery.OBJECT_STORAGE_TOTAL_USED]: (
-    rgwPrefix: string = ''
+    rgwPrefix: string = '',
+    managedByOCS: string
   ) =>
     _.template(
-      'sum(ceph_pool_metadata{name=~"<%= name %>rgw.buckets.data"} *on (job, namespace, pool_id) group_right(name) ceph_pool_stored) + max(sum(NooBaa_providers_physical_size{type!="S3_COMPATIBLE"}) or vector(0))'
+      'sum(ceph_pool_metadata{name=~"<%= name %>rgw.buckets.data",managedBy="<%= managedByOCS %>"} *on (job, namespace, pool_id) group_right(name) ceph_pool_stored{managedBy="<%= managedByOCS %>"}) + max(sum(NooBaa_providers_physical_size{type!="S3_COMPATIBLE"}) or vector(0))'
     )({
       name: rgwPrefix ? `${rgwPrefix}.` : '.*',
+      managedByOCS: managedByOCS,
     }),
 };
 
@@ -79,11 +90,11 @@ export const breakdownQueryMapMCG = {
     [CapacityBreakdown.Metrics.TOTAL]: {
       model: null,
       metric: '',
-      queries: (rgwPrefix: string = '') => ({
+      queries: (rgwPrefix: string = '', managedByOCS: string) => ({
         [ObjectServiceDashboardQuery.RGW_TOTAL_USED]: (() =>
           MCG_CAPACITY_BREAKDOWN_QUERIES[
             ObjectServiceDashboardQuery.RGW_TOTAL_USED
-          ](rgwPrefix))(),
+          ](rgwPrefix, managedByOCS))(),
         [ObjectServiceDashboardQuery.NOOBAA_TOTAL_USED]:
           MCG_CAPACITY_BREAKDOWN_QUERIES[
             ObjectServiceDashboardQuery.NOOBAA_TOTAL_USED
@@ -91,7 +102,7 @@ export const breakdownQueryMapMCG = {
         [ObjectServiceDashboardQuery.OBJECT_STORAGE_TOTAL_USED]: (() =>
           MCG_CAPACITY_BREAKDOWN_QUERIES[
             ObjectServiceDashboardQuery.OBJECT_STORAGE_TOTAL_USED
-          ](rgwPrefix))(),
+          ](rgwPrefix, managedByOCS))(),
       }),
     },
   },
@@ -149,15 +160,15 @@ export const breakdownQueryMapMCG = {
     [CapacityBreakdown.Metrics.TOTAL]: {
       model: null,
       metric: '',
-      queries: (rgwPrefix: string = '') => ({
+      queries: (rgwPrefix: string = '', managedByOCS: string) => ({
         [ObjectServiceDashboardQuery.RGW_TOTAL_USED]: (() =>
           MCG_CAPACITY_BREAKDOWN_QUERIES[
             ObjectServiceDashboardQuery.RGW_TOTAL_USED
-          ](rgwPrefix))(),
+          ](rgwPrefix, managedByOCS))(),
         [ObjectServiceDashboardQuery.RGW_USED]: (() =>
           MCG_CAPACITY_BREAKDOWN_QUERIES[
             ObjectServiceDashboardQuery.RGW_TOTAL_USED
-          ](rgwPrefix))(),
+          ](rgwPrefix, managedByOCS))(),
       }),
     },
   },
@@ -196,18 +207,16 @@ export const DATA_CONSUMPTION_QUERIES = {
       },
     },
   },
-  [ServiceType.RGW]: {
+  [ServiceType.RGW]: (managedByOCS: string) => ({
     [Metrics.LATENCY]: {
-      latencyGet:
-        'avg(rate(ceph_rgw_get_initial_lat_sum[1m])) /avg(rate(ceph_rgw_get_initial_lat_count[1m])>0)',
-      latencyPut:
-        'avg(rate(ceph_rgw_put_initial_lat_sum[1m])) /avg(rate(ceph_rgw_put_initial_lat_count[1m])>0)',
+      latencyGet: `avg(rate(ceph_rgw_get_initial_lat_sum{managedBy="${managedByOCS}"}[1m])) /avg(rate(ceph_rgw_get_initial_lat_count{managedBy="${managedByOCS}"}[1m])>0)`,
+      latencyPut: `avg(rate(ceph_rgw_put_initial_lat_sum{managedBy="${managedByOCS}"}[1m])) /avg(rate(ceph_rgw_put_initial_lat_count{managedBy="${managedByOCS}"}[1m])>0)`,
     },
     [Metrics.BANDWIDTH]: {
-      bandwidthGet: 'sum(rate(ceph_rgw_get_b[1m]))',
-      bandwidthPut: 'sum(rate(ceph_rgw_put_b[1m]))',
+      bandwidthGet: `sum(rate(ceph_rgw_get_b{managedBy="${managedByOCS}"}[1m]))`,
+      bandwidthPut: `sum(rate(ceph_rgw_put_b{managedBy="${managedByOCS}"}[1m]))`,
     },
-  },
+  }),
 };
 
 export enum ObjectStorageEfficiencyQueries {
diff --git a/packages/ocs/storage-class/sc-form.tsx b/packages/ocs/storage-class/sc-form.tsx
index 1c9084e44..f0a720bc5 100644
--- a/packages/ocs/storage-class/sc-form.tsx
+++ b/packages/ocs/storage-class/sc-form.tsx
@@ -9,8 +9,6 @@ import {
   createCsiKmsResources,
 } from '@odf/core/components/kms-config/utils';
 import {
-  OCS_INTERNAL_CR_NAME,
-  OCS_EXTERNAL_CR_NAME,
   KMS_PROVIDER,
   KMSConfigMapCSIName,
   SupportedProviders,
@@ -71,8 +69,6 @@ import {
 } from '@patternfly/react-core';
 import { CaretDownIcon } from '@patternfly/react-icons';
 import {
-  CEPH_EXTERNAL_CR_NAME,
-  CEPH_INTERNAL_CR_NAME,
   CLUSTER_STATUS,
   POOL_STATE,
   CEPH_NS_SESSION_STORAGE,
@@ -83,6 +79,11 @@ import './sc-form.scss';
 
 type OnParamChange = (id: string, paramName: string, checkbox: boolean) => void;
 
+const CEPH_EXTERNAL_CR_NAME = 'ocs-external-storagecluster-cephcluster';
+const CEPH_INTERNAL_CR_NAME = 'ocs-storagecluster-cephcluster';
+const OCS_EXTERNAL_CR_NAME = 'ocs-external-storagecluster';
+const OCS_INTERNAL_CR_NAME = 'ocs-storagecluster';
+
 export const CephFsNameComponent: React.FC<ProvisionerProps> = ({
   parameterKey,
   parameterValue,
@@ -90,6 +91,7 @@ export const CephFsNameComponent: React.FC<ProvisionerProps> = ({
 }) => {
   const { t } = useCustomTranslation();
   const onParamChangeRef = React.useRef<OnParamChange>();
+  // refernce of "onParamChange" changes on each re-render, hence storing in a "useRef"
   onParamChangeRef.current = onParamChange;
 
   const isExternal = useFlag(OCS_INDEPENDENT_FLAG);
@@ -524,6 +526,7 @@ export const StorageClassEncryptionKMSID: React.FC<ProvisionerProps> = ({
 }) => {
   const { t } = useCustomTranslation();
   const onParamChangeRef = React.useRef<OnParamChange>();
+  // refernce of "onParamChange" changes on each re-render, hence storing in a "useRef"
   onParamChangeRef.current = onParamChange;
 
   const { odfNamespace, isODFNsLoaded, odfNsLoadError } =
@@ -568,20 +571,9 @@ export const StorageClassEncryptionKMSID: React.FC<ProvisionerProps> = ({
     [parameterKey]
   );
 
-  // ToDo (Sanjal): "StorageClassForm" got refactored to a FC (https://github.com/openshift/console/pull/13036).
-  // If any "parameter" specific "Component" in un-mounting, it do not have access to latest "onParamChange" (having latest "newStorageClass" object).
-  // Talk to OCP team, maybe we can pass "onParamChange" as a "useRef" object, which can resolve this issue.
-
-  // When user selects a connection from the dropdown, but, then un-checks the encryption checkbox,
-  // and checks it back again. Component will be re-mounted, still Redux state will still
-  // have previously selected parameterValue. This useEffect is to clean that up.
-  /* React.useEffect(() => {
-    return () => setEncryptionId('');
-  }, [setEncryptionId]); */
-
   /** When csiConfigMap is deleted from another tab, "csiConfigMapLoadError" == true (404 Not Found), but,
    * "csiConfigMap" still contains same old object that was present before the deletion of the configMap.
-   * Hence, dropdown was not updating dynamically. Used csiKmsDetails to handle that.
+   * Hence, dropdown was not updating dynamically. Used "csiKmsDetails" to handle that.
    */
   const [csiKmsDetails, setCsiKmsDetails] = React.useState<ConfigMapKind>(null);
   React.useEffect(() => {
diff --git a/packages/ocs/types.ts b/packages/ocs/types.ts
index 9a3cf77aa..75527a30b 100644
--- a/packages/ocs/types.ts
+++ b/packages/ocs/types.ts
@@ -36,3 +36,5 @@ export type StoragePoolKind = K8sResourceCommon & {
     };
   };
 };
+
+export type ODFSystemParams = { namespace: string; systemName: string };
diff --git a/packages/ocs/utils/block-pool.tsx b/packages/ocs/utils/block-pool.tsx
index 4d2c7d67c..e1abd88f1 100644
--- a/packages/ocs/utils/block-pool.tsx
+++ b/packages/ocs/utils/block-pool.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ModalKeys } from '@odf/shared/modals/types';
-import { StorageClassResourceKind, CephClusterKind } from '@odf/shared/types';
+import { StorageClassResourceKind } from '@odf/shared/types';
 import { getLastLanguage } from '@odf/shared/utils';
 import { TFunction } from 'i18next';
 import {
@@ -9,7 +9,7 @@ import {
   ExclamationCircleIcon,
   LockIcon,
 } from '@patternfly/react-icons';
-import { CEPH_EXTERNAL_CR_NAME, POOL_PROGRESS, ROOK_MODEL } from '../constants';
+import { POOL_PROGRESS, ROOK_MODEL } from '../constants';
 import { StorageClusterModel } from '../models';
 import { StoragePoolKind } from '../types';
 import { LoadingComponent } from './CustomLoading';
@@ -50,11 +50,11 @@ export const isDefaultPool = (blockPoolConfig: StoragePoolKind): boolean =>
 
 export const disableMenuAction = (
   blockPoolConfig: StoragePoolKind,
-  cephCluster: CephClusterKind
+  isExternal: boolean
 ) =>
   !!(
     blockPoolConfig?.metadata?.deletionTimestamp ||
-    cephCluster?.metadata?.name === CEPH_EXTERNAL_CR_NAME ||
+    isExternal ||
     isDefaultPool(blockPoolConfig)
   );
 
diff --git a/packages/ocs/utils/ceph-health.ts b/packages/ocs/utils/ceph-health.ts
index 80c1ac209..c70f576ad 100644
--- a/packages/ocs/utils/ceph-health.ts
+++ b/packages/ocs/utils/ceph-health.ts
@@ -1,12 +1,18 @@
+import { STATE_PRIORITY } from '@odf/shared/dashboards/status-card/states';
 import { K8sResourceKind } from '@odf/shared/types';
 import { HealthState } from '@openshift-console/dynamic-plugin-sdk';
 import {
-  ResourceHealthHandler,
   SubsystemHealth,
+  ResourceHealthHandler,
 } from '@openshift-console/dynamic-plugin-sdk/lib/extensions/dashboard-types';
 import { TFunction } from 'i18next';
+import * as _ from 'lodash-es';
 
 export type WatchCephResource = {
+  ceph: K8sResourceKind;
+};
+
+export type WatchCephResources = {
   ceph: K8sResourceKind[];
 };
 
@@ -39,7 +45,7 @@ export const getCephHealthState: ResourceHealthHandler<WatchCephResource> = (
   t
 ) => {
   const { data, loaded, loadError } = ceph;
-  const status = data?.[0]?.status?.ceph?.health;
+  const status = data?.status?.ceph?.health;
 
   if (loadError) {
     return { state: HealthState.NOT_AVAILABLE };
@@ -47,12 +53,32 @@ export const getCephHealthState: ResourceHealthHandler<WatchCephResource> = (
   if (!loaded) {
     return { state: HealthState.LOADING };
   }
-  if (data.length === 0) {
+  if (_.isEmpty(data)) {
     return { state: HealthState.NOT_AVAILABLE };
   }
   return parseCephHealthStatus(status, t);
 };
 
+export const getCephsHealthState: ResourceHealthHandler<WatchCephResources> = (
+  { ceph },
+  t
+) => {
+  const { data, loaded, loadError } = ceph;
+  const cephHealthStates = data?.map((cephCluster: K8sResourceKind) =>
+    getCephHealthState({ ceph: { data: cephCluster, loaded, loadError } }, t)
+  );
+
+  let worstCephHealthState: SubsystemHealth;
+  STATE_PRIORITY.some((state) => {
+    worstCephHealthState = cephHealthStates?.find(
+      (cephHealthState) => cephHealthState.state === state
+    );
+    return !!worstCephHealthState ? true : false;
+  });
+
+  return worstCephHealthState || { state: HealthState.UNKNOWN };
+};
+
 export enum Phase {
   CONNECTED = 'Connected',
   PROGRESSING = 'Progressing',
diff --git a/packages/ocs/utils/common.ts b/packages/ocs/utils/common.ts
index 5e764a3af..c7d297438 100644
--- a/packages/ocs/utils/common.ts
+++ b/packages/ocs/utils/common.ts
@@ -33,28 +33,35 @@ export const isCephProvisioner = (scProvisioner: string): boolean => {
   );
 };
 
-export const isObjectStorageEvent = (event: EventKind): boolean => {
-  const eventKind: string = event?.involvedObject?.kind;
-  const objectStorageResources = [
-    NooBaaBackingStoreModel.kind,
-    NooBaaBucketClassModel.kind,
-    NooBaaObjectBucketClaimModel.kind,
-    CephObjectStoreModel.kind,
-  ];
-  if (
-    eventKind !== PersistentVolumeClaimModel.kind &&
-    eventKind !== PersistentVolumeModel.kind
-  ) {
-    const eventName: string = event?.involvedObject?.name;
-    return _.startsWith(eventName, 'noobaa') || eventName?.includes('rgw');
-  }
-  return objectStorageResources.includes(eventKind);
-};
+export const isObjectStorageEvent =
+  (isRGW: boolean, isMCG: boolean) =>
+  (event: EventKind): boolean => {
+    const eventKind: string = event?.involvedObject?.kind;
+    const objectStorageResources = [
+      isMCG && NooBaaBackingStoreModel.kind,
+      isMCG && NooBaaBucketClassModel.kind,
+      isMCG && NooBaaObjectBucketClaimModel.kind,
+      isRGW && CephObjectStoreModel.kind,
+    ];
+    if (
+      eventKind !== PersistentVolumeClaimModel.kind &&
+      eventKind !== PersistentVolumeModel.kind
+    ) {
+      const eventName: string = event?.involvedObject?.name;
+
+      if (isRGW && isMCG)
+        return _.startsWith(eventName, 'noobaa') || eventName?.includes('rgw');
+      if (isRGW) return eventName?.includes('rgw');
+      if (isMCG) return _.startsWith(eventName, 'noobaa');
+    }
+
+    return objectStorageResources.includes(eventKind);
+  };
 
 export const isPersistentStorageEvent =
   (pvcs: string[], ns: string) =>
   (event: EventKind): boolean => {
-    if (isObjectStorageEvent(event)) return false;
+    if (isObjectStorageEvent(true, true)(event)) return false;
     const eventKind = event?.involvedObject?.kind;
     const eventNamespace = getNamespace(event);
     const eventObjectName = event?.involvedObject?.name;
@@ -149,3 +156,6 @@ export const calcPercentage = (value: number, total: number): HumanizeResult =>
 
 export const getNetworkEncryption = (cluster: StorageClusterKind) =>
   cluster?.spec?.network?.connections?.encryption?.enabled || false;
+
+export const getOCSNameFromSS = (systemName: string) =>
+  systemName.split('-storagesystem')[0];
diff --git a/packages/ocs/utils/noobaa-health.ts b/packages/ocs/utils/noobaa-health.ts
index 3462c2e8a..46f129156 100644
--- a/packages/ocs/utils/noobaa-health.ts
+++ b/packages/ocs/utils/noobaa-health.ts
@@ -1,5 +1,8 @@
 import { getGaugeValue } from '@odf/shared/utils';
-import { HealthState } from '@openshift-console/dynamic-plugin-sdk';
+import {
+  HealthState,
+  K8sResourceCommon,
+} from '@openshift-console/dynamic-plugin-sdk';
 import {
   PrometheusHealthHandler,
   SubsystemHealth,
@@ -43,6 +46,7 @@ export const getNooBaaState: PrometheusHealthHandler = (
   const { response, error } = responses[0];
   const noobaaLoaded = noobaa?.loaded;
   const noobaaLoadError = noobaa?.loadError;
+  const noobaaData = noobaa?.data as K8sResourceCommon[];
   const statusIndex: string = getGaugeValue(response);
 
   if (error || noobaaLoadError) {
@@ -51,7 +55,7 @@ export const getNooBaaState: PrometheusHealthHandler = (
   if (!noobaaLoaded || !response) {
     return { state: HealthState.LOADING };
   }
-  if (!statusIndex) {
+  if (!statusIndex || !noobaaData?.length) {
     return { state: HealthState.NOT_AVAILABLE };
   }
   return parseNoobaaStatus(statusIndex, t);
diff --git a/packages/odf/components/alerts/alert-action-path.tsx b/packages/odf/components/alerts/alert-action-path.tsx
index 389ce00a4..f265690a3 100644
--- a/packages/odf/components/alerts/alert-action-path.tsx
+++ b/packages/odf/components/alerts/alert-action-path.tsx
@@ -1,22 +1,35 @@
+import { getStorageClusterInNs } from '@odf/core/utils';
 import { StorageClusterModel } from '@odf/ocs/models';
 import { CEPH_STORAGE_NAMESPACE } from '@odf/shared/constants';
-import { k8sGet } from '@openshift-console/dynamic-plugin-sdk';
-import { OCS_INTERNAL_CR_NAME } from '../../constants';
+import { StorageClusterKind } from '@odf/shared/types';
+import { k8sList } from '@openshift-console/dynamic-plugin-sdk';
 import { AddCapacityModal } from '../../modals/add-capacity/add-capacity-modal';
 
 export const getDiskAlertActionPath = () =>
   window.open('https://access.redhat.com/solutions/5194851');
 
+// ToDo (epic 4422): Get StorageCluster name and namespace from the Alert object and then use "k8sGet".
 export const launchClusterExpansionModal = async (alert, launchModal) => {
   try {
+    /*
     const storageCluster = await k8sGet({
       model: StorageClusterModel,
-      name: OCS_INTERNAL_CR_NAME,
-      // ToDo (epic 4422): Get StorageCluster name and namespace from the alert object
-      // else add a wrapper around "AddCapacityModal" and poll for revelant SC there.
-      ns: CEPH_STORAGE_NAMESPACE,
+      name: alert?.annotations?.target_name,
+      ns: alert?.annotations?.target_namespace,
     });
     launchModal(AddCapacityModal, { isOpen: true, storageCluster });
+    */
+    const storageCluster = (await k8sList({
+      model: StorageClusterModel,
+      queryParams: { ns: CEPH_STORAGE_NAMESPACE },
+    })) as StorageClusterKind[];
+    launchModal(AddCapacityModal, {
+      isOpen: true,
+      storageCluster: getStorageClusterInNs(
+        storageCluster,
+        CEPH_STORAGE_NAMESPACE
+      ),
+    });
   } catch (e) {
     // eslint-disable-next-line no-console
     console.error('Error launching modal', e);
diff --git a/packages/odf/components/cluster-overview-extensions/HealthOverview.tsx b/packages/odf/components/cluster-overview-extensions/HealthOverview.tsx
index 7929b6fab..357a36140 100644
--- a/packages/odf/components/cluster-overview-extensions/HealthOverview.tsx
+++ b/packages/odf/components/cluster-overview-extensions/HealthOverview.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { getCephHealthState, WatchCephResource } from '@odf/ocs/utils';
+import { getCephsHealthState, WatchCephResources } from '@odf/ocs/utils';
 import { healthStateMessage } from '@odf/shared/dashboards/status-card/states';
 import { CephClusterModel } from '@odf/shared/models';
 import { Status } from '@odf/shared/status/Status';
@@ -8,6 +8,7 @@ import { referenceForModel } from '@odf/shared/utils';
 import {
   WatchK8sResults,
   StatusPopupSection,
+  HealthState,
 } from '@openshift-console/dynamic-plugin-sdk';
 import { Link } from 'react-router-dom';
 import { Stack, StackItem } from '@patternfly/react-core';
@@ -16,7 +17,7 @@ import '@odf/shared/popup/status-popup.scss';
 export const StoragePopover: React.FC<StoragePopoverProps> = ({ ceph }) => {
   const { t } = useCustomTranslation();
 
-  const health = getCephHealthState({ ceph }, t);
+  const health = getCephsHealthState({ ceph }, t);
   const value = health.message || healthStateMessage(health.state, t);
   const operatorName = t('Data Foundation');
 
@@ -34,7 +35,12 @@ export const StoragePopover: React.FC<StoragePopoverProps> = ({ ceph }) => {
         >
           <div className="odf-status-popup__row">
             <Link to="/odf">{operatorName}</Link>
-            <Status key="ocs" status={value} />
+            <Status
+              key="ocs"
+              status={
+                health.state === HealthState.OK && !value ? t('Healthy') : value
+              }
+            />
           </div>
         </StatusPopupSection>
       </StackItem>
@@ -42,7 +48,7 @@ export const StoragePopover: React.FC<StoragePopoverProps> = ({ ceph }) => {
   );
 };
 
-export { getCephHealthState as healthHandler };
+export { getCephsHealthState as healthHandler };
 
 export const healthResource = {
   ceph: {
@@ -52,4 +58,4 @@ export const healthResource = {
   },
 };
 
-type StoragePopoverProps = WatchK8sResults<WatchCephResource>;
+type StoragePopoverProps = WatchK8sResults<WatchCephResources>;
diff --git a/packages/odf/components/create-storage-system/footer.tsx b/packages/odf/components/create-storage-system/footer.tsx
index 897fdd87b..e43f7a772 100644
--- a/packages/odf/components/create-storage-system/footer.tsx
+++ b/packages/odf/components/create-storage-system/footer.tsx
@@ -16,11 +16,7 @@ import {
 } from '@patternfly/react-core';
 import { Steps, StepsName, STORAGE_CLUSTER_SYSTEM_KIND } from '../../constants';
 import './create-storage-system.scss';
-import {
-  MINIMUM_NODES,
-  OCS_EXTERNAL_CR_NAME,
-  OCS_INTERNAL_CR_NAME,
-} from '../../constants';
+import { MINIMUM_NODES } from '../../constants';
 import { NetworkType, BackingStorageType, DeploymentType } from '../../types';
 import { labelOCSNamespace, getExternalSubSystemName } from '../../utils';
 import { createClusterKmsResources } from '../kms-config/utils';
@@ -34,6 +30,9 @@ import {
 } from './payloads';
 import { WizardCommonProps, WizardState } from './reducer';
 
+const OCS_EXTERNAL_CR_NAME = 'ocs-external-storagecluster';
+const OCS_INTERNAL_CR_NAME = 'ocs-storagecluster';
+
 const validateBackingStorageStep = (
   backingStorage: WizardState['backingStorage'],
   sc: WizardState['storageClass']
@@ -154,7 +153,7 @@ const handleReviewAndCreateNext = async (
             isMCG
           )
         );
-      await createStorageCluster(state, odfNamespace);
+      await createStorageCluster(state, odfNamespace, OCS_INTERNAL_CR_NAME);
     } else if (
       type === BackingStorageType.EXISTING ||
       type === BackingStorageType.LOCAL_DEVICES
@@ -174,7 +173,7 @@ const handleReviewAndCreateNext = async (
         STORAGE_CLUSTER_SYSTEM_KIND,
         odfNamespace
       );
-      await createStorageCluster(state, odfNamespace);
+      await createStorageCluster(state, odfNamespace, OCS_INTERNAL_CR_NAME);
     } else if (type === BackingStorageType.EXTERNAL) {
       const { createPayload, model, displayName, waitToCreate } =
         getExternalStorage(externalStorage, supportedExternalStorage) || {};
@@ -209,7 +208,7 @@ const handleReviewAndCreateNext = async (
               kms.provider
             )
           );
-        await createStorageCluster(state, odfNamespace);
+        await createStorageCluster(state, odfNamespace, OCS_INTERNAL_CR_NAME);
       }
       if (!isRhcs && !!waitToCreate) await waitToCreate(model);
       await createExternalSubSystem(subSystemPayloads);
diff --git a/packages/odf/components/create-storage-system/payloads.ts b/packages/odf/components/create-storage-system/payloads.ts
index 1a993557c..0f6be5c37 100644
--- a/packages/odf/components/create-storage-system/payloads.ts
+++ b/packages/odf/components/create-storage-system/payloads.ts
@@ -46,7 +46,8 @@ export const createStorageSystem = async (
 
 export const createStorageCluster = async (
   state: WizardState,
-  odfNamespace: string
+  odfNamespace: string,
+  storageClusterName: string
 ) => {
   const {
     storageClass,
@@ -114,6 +115,7 @@ export const createStorageCluster = async (
     isSingleReplicaPoolEnabled: enableSingleReplicaPool,
     enableRDRPreparation,
     odfNamespace,
+    storageClusterName,
   });
   return k8sCreate({ model: OCSStorageClusterModel, data: payload });
 };
diff --git a/packages/odf/components/mcg/CreateObjectBucketClaim.tsx b/packages/odf/components/mcg/CreateObjectBucketClaim.tsx
index ebcdb92a6..34d0ef260 100644
--- a/packages/odf/components/mcg/CreateObjectBucketClaim.tsx
+++ b/packages/odf/components/mcg/CreateObjectBucketClaim.tsx
@@ -480,9 +480,10 @@ export const CreateOBCPage: React.FC<CreateOBCPageProps> = () => {
       });
   };
 
-  // Operator install namespace is determined using Subscriptions, which non-admin can not access (yet).
+  // Operator install namespace is determined using Subscriptions, which non-admin can not access.
   // Using "allowFallback" in "NamespaceSafetyBox" so that they can default to "openshift-storage" (if case of access issues),
   // which is current use case as well (as we do not officially support UI if ODF is installed in any other Namespace).
+  // ToDo (Sanjal): Update the non-admin "Role" to a "ClusterRole", then read list of NooBaa/BucketClasses across all namespaces.
   return (
     <>
       <NamespaceBar />
diff --git a/packages/odf/components/namespace-store/namespace-store-dropdown.tsx b/packages/odf/components/namespace-store/namespace-store-dropdown.tsx
index e4f4fb45f..e244f95da 100644
--- a/packages/odf/components/namespace-store/namespace-store-dropdown.tsx
+++ b/packages/odf/components/namespace-store/namespace-store-dropdown.tsx
@@ -29,9 +29,10 @@ export const NamespaceStoreDropdown: React.FC<NamespaceStoreDropdownProps> = ({
   const [isOpen, setOpen] = React.useState(false);
   const [dropdownItems, setDropdownItems] = React.useState<JSX.Element[]>([]);
 
-  // Operator install namespace is determined using Subscriptions, which non-admin can not access (yet).
+  // Operator install namespace is determined using Subscriptions, which non-admin can not access.
   // Using "true" in "useSafeK8sWatchResource" so that they can default to "openshift-storage" (if case of access issues),
   // which is current use case as well (as we do not officially support UI if ODF is installed in any other Namespace).
+  // ToDo (Sanjal): Update the non-admin "Role" to a "ClusterRole", then read list of NamespaceStores across all namespaces.
   const [nnsData, , nnsLoadErr] = useSafeK8sWatchResource<NamespaceStoreKind[]>(
     namespaceStoreResource,
     true
diff --git a/packages/odf/components/object-service-nav-item/object-service.tsx b/packages/odf/components/object-service-nav-item/object-service.tsx
index f0c6a57e8..14ef69331 100644
--- a/packages/odf/components/object-service-nav-item/object-service.tsx
+++ b/packages/odf/components/object-service-nav-item/object-service.tsx
@@ -12,7 +12,6 @@ import { StatusBox } from '@odf/shared/generic/status-box';
 import PageHeading from '@odf/shared/heading/page-heading';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { referenceForModel } from '@odf/shared/utils';
-// import { useODFNamespaceSelector } from '@odf/core/redux';
 import {
   HorizontalNav,
   useResolvedExtensions,
@@ -38,8 +37,6 @@ const ObjectServicePage: React.FC = () => {
   const { t } = useCustomTranslation();
   const title = t('Object Storage');
 
-  // const { isODFNsLoaded, odfNsLoadError, isNsSafe } = useODFNamespaceSelector();
-
   const [extensions, isLoaded, error] = useResolvedExtensions<HorizontalNavTab>(
     isObjectServiceTab as ExtensionTypeGuard<HorizontalNavTab>
   );
diff --git a/packages/odf/components/odf-dashboard/performance-card/performance-card.tsx b/packages/odf/components/odf-dashboard/performance-card/performance-card.tsx
index 0ac7975db..ee069d1cf 100644
--- a/packages/odf/components/odf-dashboard/performance-card/performance-card.tsx
+++ b/packages/odf/components/odf-dashboard/performance-card/performance-card.tsx
@@ -1,6 +1,4 @@
 import * as React from 'react';
-import { useSafeK8sWatchResource } from '@odf/core/hooks';
-import { K8sResourceObj } from '@odf/core/types';
 import LineGraph, {
   LineGraphProps,
 } from '@odf/shared/dashboards/line-graph/line-graph';
@@ -21,6 +19,7 @@ import {
   referenceFor,
   referenceForModel,
 } from '@odf/shared/utils';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import {
   UtilizationDurationDropdown,
   useUtilizationDuration,
@@ -40,6 +39,7 @@ import { generateDataFrames } from './utils';
 
 type RowProps = {
   systemName: string;
+  systemNamespace: string;
   managedSystemKind: string;
   managedSystemName: string;
   currentLocation: string;
@@ -57,6 +57,7 @@ type GetRow = (
 const getRow: GetRow = ({
   managedSystemKind,
   systemName,
+  systemNamespace,
   iopsData,
   throughputData,
   latencyData,
@@ -67,7 +68,7 @@ const getRow: GetRow = ({
   return [
     <ResourceLink
       key={systemName}
-      link={getDashboardLink(refKind, systemName)}
+      link={getDashboardLink(refKind, systemName, systemNamespace)}
       resourceModel={ODFStorageSystem}
       resourceName={systemName}
     />,
@@ -94,11 +95,10 @@ const getRow: GetRow = ({
   ];
 };
 
-const storageSystemResource: K8sResourceObj = (ns) => ({
+const storageSystemResource = {
   kind: referenceForModel(ODFStorageSystem),
-  namespace: ns,
   isList: true,
-});
+};
 
 const nameSort = (a: RowProps, b: RowProps, c: SortByDirection) => {
   const negation = c !== SortByDirection.asc;
@@ -149,7 +149,7 @@ const PerformanceCard: React.FC = () => {
     [t]
   );
 
-  const [systems, systemLoaded, systemLoadError] = useSafeK8sWatchResource<
+  const [systems, systemLoaded, systemLoadError] = useK8sWatchResource<
     StorageSystemKind[]
   >(storageSystemResource);
   const { duration } = useUtilizationDuration();
diff --git a/packages/odf/components/odf-dashboard/performance-card/utils.ts b/packages/odf/components/odf-dashboard/performance-card/utils.ts
index 1aad2c308..d1d03af87 100644
--- a/packages/odf/components/odf-dashboard/performance-card/utils.ts
+++ b/packages/odf/components/odf-dashboard/performance-card/utils.ts
@@ -10,6 +10,7 @@ import * as _ from 'lodash-es';
 
 type DataFrame = {
   systemName: string;
+  systemNamespace: string;
   managedSystemKind: string;
   managedSystemName: string;
   currentLocation: string;
@@ -25,6 +26,9 @@ const getDatForSystem = (
   humanizer: Function
 ) => {
   const systemName = system.spec.name;
+  // ToDo (epic 4422): This equality check should work (for now) as "managedBy" will be unique,
+  // but moving forward add a label to metric for StorageSystem namespace as well and use that instead (update query as well).
+  // Equality check should be updated as well with "&&" condition on StorageSystem namespace.
   const relatedMetrics = promData?.data?.result?.find(
     (value) => value.metric.managedBy === systemName
   );
@@ -51,6 +55,7 @@ export const generateDataFrames = (
       managedSystemKind: curr.spec.kind,
       managedSystemName: curr.spec.name,
       systemName: curr.metadata.name,
+      systemNamespace: curr.metadata.namespace,
       currentLocation: '/',
       iopsData: {
         data: getDatForSystem(id, curr, humanizeIOPS),
diff --git a/packages/odf/components/odf-dashboard/queries.ts b/packages/odf/components/odf-dashboard/queries.ts
index 584e844c9..87fcbb7f2 100644
--- a/packages/odf/components/odf-dashboard/queries.ts
+++ b/packages/odf/components/odf-dashboard/queries.ts
@@ -29,5 +29,5 @@ export const UTILIZATION_QUERY = {
 
 // ToDo (epic 4422): Need to update as per updates in the metrics
 export const STATUS_QUERIES = {
-  [StorageDashboard.HEALTH]: `(label_replace(odf_system_map{target_namespace="openshift-storage"} , "managedBy", "$1", "target_name", "(.*)"))  * on (namespace, managedBy) group_right(storage_system) ${SYSTEM_HEALTH_METRIC}`,
+  [StorageDashboard.HEALTH]: `(label_replace(odf_system_map, "managedBy", "$1", "target_name", "(.*)"))  * on (namespace, managedBy) group_right(storage_system) ${SYSTEM_HEALTH_METRIC}`,
 };
diff --git a/packages/odf/components/odf-dashboard/status-card/status-card.tsx b/packages/odf/components/odf-dashboard/status-card/status-card.tsx
index ec19d0578..06c57408e 100644
--- a/packages/odf/components/odf-dashboard/status-card/status-card.tsx
+++ b/packages/odf/components/odf-dashboard/status-card/status-card.tsx
@@ -10,6 +10,7 @@ import {
   usePrometheusBasePath,
 } from '@odf/shared/hooks/custom-prometheus-poll';
 import { OCSStorageClusterModel, ODFStorageSystem } from '@odf/shared/models';
+import { getName, getNamespace } from '@odf/shared/selectors';
 import {
   ClusterServiceVersionKind,
   StorageSystemKind,
@@ -21,7 +22,10 @@ import {
   referenceForGroupVersionKind,
   getOperatorHealthState,
 } from '@odf/shared/utils';
-import { HealthState } from '@openshift-console/dynamic-plugin-sdk';
+import {
+  HealthState,
+  useK8sWatchResource,
+} from '@openshift-console/dynamic-plugin-sdk';
 import { HealthBody } from '@openshift-console/dynamic-plugin-sdk-internal';
 import {
   Gallery,
@@ -43,17 +47,16 @@ const operatorResource: K8sResourceObj = (ns) => ({
   isList: true,
 });
 
-const storageSystemResource: K8sResourceObj = (ns) => ({
+const storageSystemResource = {
   kind: referenceForModel(ODFStorageSystem),
-  namespace: ns,
   isList: true,
-});
+};
 
 export const StatusCard: React.FC = () => {
   const { t } = useCustomTranslation();
   const [csvData, csvLoaded, csvLoadError] =
     useSafeK8sWatchResource<ClusterServiceVersionKind[]>(operatorResource);
-  const [systems, systemsLoaded, systemsLoadError] = useSafeK8sWatchResource<
+  const [systems, systemsLoaded, systemsLoadError] = useK8sWatchResource<
     StorageSystemKind[]
   >(storageSystemResource);
 
@@ -69,7 +72,7 @@ export const StatusCard: React.FC = () => {
   const operatorStatus = operator?.status?.phase;
 
   // Todo(bipuladh): In 4.11 this should come in from an extension point
-  const ocsHealthStatus = useGetOCSHealth();
+  const ocsHealthStatuses = useGetOCSHealth(systems);
 
   const parsedHealthData =
     !healthError &&
@@ -79,9 +82,15 @@ export const StatusCard: React.FC = () => {
     healthData
       ? healthData?.data?.result?.reduce((acc, curr) => {
           const systemName = curr.metric.storage_system;
+          // ToDo (epic 4422): This equality check should work (for now) as "storage_system" will be unique,
+          // but moving forward add a label to metric for StorageSystem namespace as well and use that instead (update query as well).
+          // Equality check should be updated as well with "&&" condition on StorageSystem namespace.
           const storageSystem = systems.find(
-            (system) => system.metadata.name === systemName
+            (system) => getName(system) === systemName
           );
+          const systemNamespace = getNamespace(storageSystem);
+          const ocsHealthStatus =
+            ocsHealthStatuses[systemName + systemNamespace];
           const { apiGroup, apiVersion, kind } = getGVK(
             storageSystem?.spec.kind
           );
@@ -96,6 +105,7 @@ export const StatusCard: React.FC = () => {
                   link: getVendorDashboardLinkFromMetrics(
                     systemKind,
                     systemName,
+                    systemNamespace,
                     ocsHealthStatus.errorComponent
                   ),
 
@@ -109,7 +119,8 @@ export const StatusCard: React.FC = () => {
                   healthState: healthStateMap(curr.value[1]),
                   link: getVendorDashboardLinkFromMetrics(
                     systemKind,
-                    systemName
+                    systemName,
+                    systemNamespace
                   ),
                 };
           return [...acc, systemData];
diff --git a/packages/odf/components/odf-dashboard/system-capacity-card/capacity-card.tsx b/packages/odf/components/odf-dashboard/system-capacity-card/capacity-card.tsx
index f5e861b76..0de41090e 100644
--- a/packages/odf/components/odf-dashboard/system-capacity-card/capacity-card.tsx
+++ b/packages/odf/components/odf-dashboard/system-capacity-card/capacity-card.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { useSafeK8sWatchResource } from '@odf/core/hooks';
-import { K8sResourceObj } from '@odf/core/types';
+import { isMCGStandaloneCluster, isExternalCluster } from '@odf/core/utils';
 import CapacityCard, {
   CapacityMetricDatum,
 } from '@odf/shared/dashboards/capacity-card/capacity-card';
@@ -18,40 +17,44 @@ import {
   referenceFor,
   referenceForModel,
 } from '@odf/shared/utils';
-import { PrometheusResponse } from '@openshift-console/dynamic-plugin-sdk';
+import {
+  PrometheusResponse,
+  useK8sWatchResource,
+} from '@openshift-console/dynamic-plugin-sdk';
 import * as _ from 'lodash-es';
 import { Card, CardBody, CardHeader, CardTitle } from '@patternfly/react-core';
 import { storageCapacityTooltip } from '../../../constants';
 import { StorageDashboard, CAPACITY_QUERIES } from '../queries';
 
-const storageSystemResource: K8sResourceObj = (ns) => ({
+const storageSystemResource = {
   kind: referenceForModel(ODFStorageSystem),
-  namespace: ns,
   isList: true,
-});
+};
 
-const storageClusterResource: K8sResourceObj = (ns) => ({
+const storageClusterResource = {
   kind: referenceForModel(OCSStorageClusterModel),
-  namespace: ns,
   isList: true,
-});
+};
 
 const getMetricForSystem = (
   metric: PrometheusResponse,
   system: StorageSystemKind
 ) =>
+  // ToDo (epic 4422): This equality check should work (for now) as "managedBy" will be unique,
+  // but moving forward add a label to metric for StorageSystem namespace as well and use that,
+  // equality check should be updated with "&&" condition on StorageSystem namespace.
   metric?.data?.result?.find(
     (value) => value.metric.managedBy === system.spec.name
   );
 
 const SystemCapacityCard: React.FC = () => {
   const { t } = useCustomTranslation();
-  const [systems, systemsLoaded, systemsLoadError] = useSafeK8sWatchResource<
+  const [systems, systemsLoaded, systemsLoadError] = useK8sWatchResource<
     StorageSystemKind[]
   >(storageSystemResource);
 
   const [storageClusters, storageClustersLoaded, storageClustersLoadError] =
-    useSafeK8sWatchResource<StorageClusterKind[]>(storageClusterResource);
+    useK8sWatchResource<StorageClusterKind[]>(storageClusterResource);
 
   const [usedCapacity, errorUsedCapacity, loadingUsedCapacity] =
     useCustomPrometheusPoll({
@@ -67,16 +70,6 @@ const SystemCapacityCard: React.FC = () => {
       basePath: usePrometheusBasePath(),
     });
 
-  const isMCGCluster = (storageCluster: StorageClusterKind) => {
-    return (
-      storageCluster.spec?.multiCloudGateway?.reconcileStrategy === 'standalone'
-    );
-  };
-
-  const isExternalCluster = (storageCluster: StorageClusterKind) => {
-    return !_.isEmpty(storageCluster.spec?.externalStorage);
-  };
-
   // We are filtering internal only storagesystems as the metrics are not applicable for MCG standalone and external only StorageSystems.
   // https://bugzilla.redhat.com/show_bug.cgi?id=2185042
   const internalOnlySystems: StorageSystemKind[] = systems.filter((sys) => {
@@ -86,7 +79,8 @@ const SystemCapacityCard: React.FC = () => {
       storageClusters.find((sc) => sc.metadata.name === sys.spec.name);
     if (
       !!storageCluster &&
-      (isMCGCluster(storageCluster) || isExternalCluster(storageCluster))
+      (isMCGStandaloneCluster(storageCluster) ||
+        isExternalCluster(storageCluster))
     ) {
       return false;
     }
@@ -104,6 +98,7 @@ const SystemCapacityCard: React.FC = () => {
           const totalMetric = getMetricForSystem(totalCapacity, system);
           const datum = {
             name: system.metadata.name,
+            namespace: system.metadata.namespace,
             managedSystemName: system.spec.name,
             managedSystemKind: referenceFor(apiGroup)(apiVersion)(kind),
             usedValue: usedMetric
diff --git a/packages/odf/components/system-list/odf-system-list.tsx b/packages/odf/components/system-list/odf-system-list.tsx
index c0d2e2cc6..4a627dd62 100644
--- a/packages/odf/components/system-list/odf-system-list.tsx
+++ b/packages/odf/components/system-list/odf-system-list.tsx
@@ -6,6 +6,7 @@ import {
 import { Kebab } from '@odf/shared/kebab/kebab';
 import { ClusterServiceVersionModel } from '@odf/shared/models';
 import { ODFStorageSystem } from '@odf/shared/models';
+import { getName, getNamespace } from '@odf/shared/selectors';
 import { Status } from '@odf/shared/status/Status';
 import {
   ClusterServiceVersionKind,
@@ -46,7 +47,7 @@ import { OperandStatus } from '../utils';
 import ODFSystemLink from './system-link';
 
 type SystemMetrics = {
-  [systeName: string]: {
+  [systeNameAndNamespace: string]: {
     rawCapacity: HumanizeResult;
     usedCapacity: HumanizeResult;
     iops: HumanizeResult;
@@ -82,8 +83,11 @@ export const normalizeMetrics: MetricNormalize = (
   ) {
     return {};
   }
+  // ToDo (epic 4422): This equality check should work (for now) as "managedBy" will be unique,
+  // but moving forward add a label to metric for StorageSystem namespace as well and use that,
+  // equality check should be updated with "&&" condition on StorageSystem namespace.
   return systems.reduce<SystemMetrics>((acc, curr) => {
-    acc[curr.metadata.name] = {
+    acc[getName(curr) + getNamespace(curr)] = {
       rawCapacity: humanizeBinaryBytes(
         rawCapacity.data.result.find(
           (item) => item?.metric?.managedBy === curr.spec.name
@@ -246,10 +250,12 @@ const StorageSystemRow: React.FC<RowProps<StorageSystemKind, CustomData>> = ({
   const { t } = useCustomTranslation();
   const { apiGroup, apiVersion, kind } = getGVK(obj.spec.kind);
   const systemKind = referenceForGroupVersionKind(apiGroup)(apiVersion)(kind);
-  const systemName = obj?.metadata?.name;
+  const systemName = getName(obj);
+  const systemNamespace = getNamespace(obj);
   const { normalizedMetrics } = rowData;
 
-  const metrics = normalizedMetrics?.normalizedMetrics?.[systemName];
+  const metrics =
+    normalizedMetrics?.normalizedMetrics?.[systemName + systemNamespace];
 
   const { rawCapacity, usedCapacity, iops, throughput, latency } =
     metrics || {};
@@ -260,6 +266,7 @@ const StorageSystemRow: React.FC<RowProps<StorageSystemKind, CustomData>> = ({
           kind={systemKind}
           systemName={systemName}
           providerName={systemName}
+          systemNamespace={systemNamespace}
         />
       </TableData>
       <TableData {...tableColumnInfo[1]} activeColumnIDs={activeColumnIDs}>
diff --git a/packages/odf/components/system-list/system-link.tsx b/packages/odf/components/system-list/system-link.tsx
index ba232f367..58873aed2 100644
--- a/packages/odf/components/system-list/system-link.tsx
+++ b/packages/odf/components/system-list/system-link.tsx
@@ -7,14 +7,16 @@ type ODFSystemLinkProps = {
   kind: string;
   providerName: string;
   systemName: string;
+  systemNamespace: string;
 };
 
 const ODFSystemLink: React.FC<ODFSystemLinkProps> = ({
   kind,
   systemName,
   providerName,
+  systemNamespace,
 }) => {
-  const path = `/odf/system/${kind}/${providerName}/overview`;
+  const path = `/odf/system/ns/${systemNamespace}/${kind}/${providerName}/overview`;
   return (
     <span>
       <ResourceIcon resourceModel={ODFStorageSystem} />
diff --git a/packages/odf/components/topology/Topology.tsx b/packages/odf/components/topology/Topology.tsx
index 0fa661b12..dd53c16f9 100644
--- a/packages/odf/components/topology/Topology.tsx
+++ b/packages/odf/components/topology/Topology.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { useSafeK8sWatchResource } from '@odf/core/hooks';
 import { useODFNamespaceSelector } from '@odf/core/redux';
+import { getStorageClusterInNs } from '@odf/core/utils';
 import HandleErrorAndLoading from '@odf/shared/error-handler/ErrorStateHandler';
 import { useDeepCompareMemoize } from '@odf/shared/hooks/deep-compare-memoize';
 import {
@@ -9,6 +10,7 @@ import {
   NodeModel,
 } from '@odf/shared/models';
 import { getName, getUID } from '@odf/shared/selectors';
+import { BlueInfoCircleIcon } from '@odf/shared/status';
 import {
   createNode,
   defaultLayoutFactory,
@@ -59,6 +61,7 @@ import {
   CEPH_FLAG,
   MCG_STANDALONE,
   OCS_INDEPENDENT_FLAG,
+  OCS_CONVERGED_FLAG,
 } from '../../features';
 import {
   nodeResource,
@@ -112,6 +115,22 @@ type BackButtonProps = {
   onClick: () => void;
 };
 
+const MessageButton: React.FC = () => {
+  const { t } = useCustomTranslation();
+  const [showMessage, setShowMessage] = React.useState(false);
+
+  return (
+    <div className="odf-topology__message-button">
+      <BlueInfoCircleIcon />{' '}
+      {showMessage &&
+        t('This view is only supported for Internal mode cluster.')}{' '}
+      <a onClick={() => setShowMessage(!showMessage)}>
+        {!showMessage ? t('Show message') : t('Hide message')}
+      </a>
+    </div>
+  );
+};
+
 const BackButton: React.FC<BackButtonProps> = ({ onClick }) => {
   const { t } = useCustomTranslation();
   return (
@@ -426,6 +445,7 @@ const TopologyViewComponent: React.FC = () => {
       {currentView === TopologyViewLevel.DEPLOYMENTS && (
         <BackButton onClick={toggleVisualizationLevel} />
       )}
+      <MessageButton />
       <VisualizationSurface state={{ selectedIds }} />
     </TopologyView>
   );
@@ -449,7 +469,7 @@ const Topology: React.FC = () => {
   const [nodes, nodesLoaded, nodesError] =
     useK8sWatchResource<NodeKind[]>(nodeResource);
 
-  const [storageCluster, storageClusterLoaded, storageClusterError] =
+  const [storageClusters, storageClustersLoaded, storageClustersError] =
     useK8sWatchResource<StorageClusterKind[]>(storageClusterResource);
 
   const [deployments, deploymentsLoaded, deploymentsError] =
@@ -467,6 +487,13 @@ const Topology: React.FC = () => {
   const [daemonSets, daemonSetsLoaded, daemonSetError] =
     useSafeK8sWatchResource<K8sResourceCommon[]>(odfDaemonSetResource);
 
+  // ToDo (epic 4422): This will work as Internal mode cluster will only be created in ODF install namespace.
+  // Still, make this generic so that this works even if it gets created in a different namespace.
+  const storageCluster: StorageClusterKind = getStorageClusterInNs(
+    storageClusters,
+    odfNamespace
+  );
+
   const storageLabel = cephStorageLabel(odfNamespace);
   const odfNodes = nodes.filter((node) =>
     _.has(node.metadata.labels, storageLabel)
@@ -527,7 +554,7 @@ const Topology: React.FC = () => {
 
   const loading =
     !nodesLoaded ||
-    !storageClusterLoaded ||
+    !storageClustersLoaded ||
     !deploymentsLoaded ||
     !podsLoaded ||
     !statefulSetLoaded ||
@@ -541,7 +568,7 @@ const Topology: React.FC = () => {
     <TopologyDataContext.Provider
       value={{
         nodes: memoizedNodes,
-        storageCluster: storageCluster[0],
+        storageCluster: storageCluster,
         zones,
         deployments: memoizedDeployments,
         visualizationLevel: visualizationLevel,
@@ -561,7 +588,7 @@ const Topology: React.FC = () => {
             <HandleErrorAndLoading
               loading={loading}
               error={
-                storageClusterError ||
+                storageClustersError ||
                 nodesError ||
                 deploymentsError ||
                 podsError ||
@@ -583,10 +610,12 @@ const Topology: React.FC = () => {
 
 type TopologyViewErrorMessageProps = {
   isExternalMode?: boolean;
+  isInternalMode?: boolean;
 };
 
 const TopologyViewErrorMessage: React.FC<TopologyViewErrorMessageProps> = ({
   isExternalMode,
+  isInternalMode,
 }) => {
   const { t } = useCustomTranslation();
 
@@ -608,20 +637,21 @@ const TopologyViewErrorMessage: React.FC<TopologyViewErrorMessageProps> = ({
 
   const createLink = `/k8s/ns/${odfNamespace}/operators.coreos.com~v1alpha1~ClusterServiceVersion/${odfCsvName}/odf.openshift.io~v1alpha1~StorageSystem/~new`;
 
-  const showCreateSSOption = !isExternalMode && isNsSafe;
+  // If external mode cluster exists, we do not allow internal mode cluster creation (in case of multiple StorageSystem support)
+  const hideCreateSSOption = (isExternalMode && !isInternalMode) || !isNsSafe;
   return (
     <EmptyState>
       <EmptyStateIcon icon={TopologyIcon} />
       <Title headingLevel="h4" size="lg">
         {isExternalMode
-          ? t('Topology view is not supported for External Mode')
+          ? t('Topology view is not supported for External mode')
           : t('No StorageCluster found')}
       </Title>
       <EmptyStateBody>
-        {showCreateSSOption &&
+        {!hideCreateSSOption &&
           t('Set up a storage cluster to view the topology')}
       </EmptyStateBody>
-      {showCreateSSOption && (
+      {!hideCreateSSOption && (
         <Link to={createLink}>{t('Create StorageSystem')} </Link>
       )}
     </EmptyState>
@@ -629,16 +659,21 @@ const TopologyViewErrorMessage: React.FC<TopologyViewErrorMessageProps> = ({
 };
 
 const TopologyWithErrorHandler: React.FC = () => {
+  // ToDo (Sanjal): Remove usage of these flags and use the ones from the redux.
   const isCephAvailable = useFlag(CEPH_FLAG);
   const isMCGAvailable = useFlag(MCG_STANDALONE);
   const isExternalMode = useFlag(OCS_INDEPENDENT_FLAG);
+  const isInternalMode = useFlag(OCS_CONVERGED_FLAG);
 
-  const showDashboard = (isCephAvailable || isMCGAvailable) && !isExternalMode;
+  const showDashboard = (isCephAvailable || isMCGAvailable) && isInternalMode;
 
   return showDashboard ? (
     <Topology />
   ) : (
-    <TopologyViewErrorMessage isExternalMode={isExternalMode} />
+    <TopologyViewErrorMessage
+      isExternalMode={isExternalMode}
+      isInternalMode={isInternalMode}
+    />
   );
 };
 
diff --git a/packages/odf/components/topology/sidebar/storage-cluster/StorageClusterDetails.tsx b/packages/odf/components/topology/sidebar/storage-cluster/StorageClusterDetails.tsx
index 2b8445a7f..17cadeda9 100644
--- a/packages/odf/components/topology/sidebar/storage-cluster/StorageClusterDetails.tsx
+++ b/packages/odf/components/topology/sidebar/storage-cluster/StorageClusterDetails.tsx
@@ -1,12 +1,9 @@
 import * as React from 'react';
 import { cephStorageLabel } from '@odf/core/constants';
-import { CEPH_FLAG, OCS_INDEPENDENT_FLAG } from '@odf/core/features';
-import { useSafeK8sList } from '@odf/core/hooks';
 import { useODFNamespaceSelector } from '@odf/core/redux';
 import { nodeResource } from '@odf/core/resources';
 import { getDataResiliencyState } from '@odf/ocs/dashboards/persistent-internal/status-card/utils';
 import { StorageEfficiencyContent } from '@odf/ocs/dashboards/persistent-internal/storage-efficiency-card/storage-efficiency-card';
-import { StorageClusterModel } from '@odf/ocs/models';
 import { DATA_RESILIENCY_QUERY, StorageDashboardQuery } from '@odf/ocs/queries';
 import { getCephNodes, getOperatorVersion } from '@odf/ocs/utils';
 import { DASH, ODF_OPERATOR } from '@odf/shared/constants';
@@ -33,10 +30,7 @@ import {
   resourcePathFromModel,
   getInfrastructurePlatform,
 } from '@odf/shared/utils';
-import {
-  useFlag,
-  useK8sWatchResource,
-} from '@openshift-console/dynamic-plugin-sdk';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import {
   HealthItem,
   ResourceInventoryItem,
@@ -44,8 +38,10 @@ import {
 import * as _ from 'lodash-es';
 import { Link } from 'react-router-dom';
 
-const resiliencyProgressQuery =
-  DATA_RESILIENCY_QUERY[StorageDashboardQuery.RESILIENCY_PROGRESS];
+const resiliencyProgressQuery = (managedByOCS: string) =>
+  DATA_RESILIENCY_QUERY(managedByOCS)[
+    StorageDashboardQuery.RESILIENCY_PROGRESS
+  ];
 
 export type StorageClusterDetailsProps = {
   resource: StorageClusterKind;
@@ -60,15 +56,8 @@ export const StorageClusterDetails: React.FC<StorageClusterDetailsProps> = ({
 
   const [infrastructure, infrastructureLoaded, infrastructureError] =
     useK8sGet<K8sResourceKind>(InfrastructureModel, 'cluster');
-  const [ocsData, ocsLoaded, ocsError] = useSafeK8sList(
-    StorageClusterModel,
-    odfNamespace
-  );
-  const cluster = ocsData?.find(
-    (item: StorageClusterKind) => item.status.phase !== 'Ignored'
-  );
 
-  const ocsName = ocsLoaded && _.isEmpty(ocsError) ? getName(cluster) : DASH;
+  const ocsName = getName(storageCluster);
   const infrastructurePlatform =
     infrastructureLoaded && _.isEmpty(infrastructureError)
       ? getInfrastructurePlatform(infrastructure)
@@ -76,7 +65,7 @@ export const StorageClusterDetails: React.FC<StorageClusterDetailsProps> = ({
 
   const [resiliencyProgress, resiliencyProgressError] = useCustomPrometheusPoll(
     {
-      query: resiliencyProgressQuery,
+      query: resiliencyProgressQuery(ocsName),
       endpoint: 'api/v1/query' as any,
       basePath: usePrometheusBasePath(),
     }
@@ -86,10 +75,8 @@ export const StorageClusterDetails: React.FC<StorageClusterDetailsProps> = ({
     t
   );
 
-  const isIndependent = useFlag(OCS_INDEPENDENT_FLAG);
-  const isCephAvailable = useFlag(CEPH_FLAG);
-  const mode =
-    !isIndependent && isCephAvailable ? t('Internal') : t('External');
+  // Topology is only supported for Internal mode
+  const mode = t('Internal');
 
   const [csv, csvLoaded, csvError] = useFetchCsv({
     specName: ODF_OPERATOR,
diff --git a/packages/odf/components/topology/sidebar/storage-cluster/StorageClusterObserve.tsx b/packages/odf/components/topology/sidebar/storage-cluster/StorageClusterObserve.tsx
index a015b5474..96b224575 100644
--- a/packages/odf/components/topology/sidebar/storage-cluster/StorageClusterObserve.tsx
+++ b/packages/odf/components/topology/sidebar/storage-cluster/StorageClusterObserve.tsx
@@ -1,23 +1,10 @@
 import * as React from 'react';
-import { UtilizationContent as ExternalUtilizationContent } from '@odf/ocs/dashboards/persistent-external/utilization-card';
 import { UtilizationContent as InternalUtilizationContent } from '@odf/ocs/dashboards/persistent-internal/utilization-card/utilization-card';
-import {
-  K8sResourceCommon,
-  useFlag,
-} from '@openshift-console/dynamic-plugin-sdk';
-import { CEPH_FLAG, OCS_INDEPENDENT_FLAG } from '../../../../features';
+import { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';
 
 export const StorageClusterObserve: React.FC<{
   resource?: K8sResourceCommon;
   odfNamespace?: string;
 }> = () => {
-  const isIndependent = useFlag(OCS_INDEPENDENT_FLAG);
-  const isCephAvailable = useFlag(CEPH_FLAG);
-  const isInternal = !isIndependent && isCephAvailable;
-
-  return isInternal ? (
-    <InternalUtilizationContent />
-  ) : (
-    <ExternalUtilizationContent />
-  );
+  return <InternalUtilizationContent />;
 };
diff --git a/packages/odf/components/topology/topology.scss b/packages/odf/components/topology/topology.scss
index a6fd034c8..7ddea6740 100644
--- a/packages/odf/components/topology/topology.scss
+++ b/packages/odf/components/topology/topology.scss
@@ -27,6 +27,16 @@
     z-index: 2;
 }
 
+.odf-topology__message-button {
+    color: #393F44;
+    right: var(--pf-global--gutter);
+    position: absolute;
+    top: var(--pf-global--gutter);
+    font-size: var(--pf-global--FontSize--xs);
+    font-weight: var(--pf-global--FontWeight--normal);
+    z-index: 2;
+}
+
 .odf-topology__back-button:hover {
     box-shadow: 1px 1px 3px 1px #aaabac;
     cursor: pointer;
diff --git a/packages/odf/components/utils/common.ts b/packages/odf/components/utils/common.ts
index 97038ae53..ffebbbccf 100644
--- a/packages/odf/components/utils/common.ts
+++ b/packages/odf/components/utils/common.ts
@@ -41,7 +41,6 @@ import {
   OCS_DEVICE_SET_FLEXIBLE_REPLICA,
   OCS_DEVICE_SET_MINIMUM_REPLICAS,
   ATTACHED_DEVICES_ANNOTATION,
-  OCS_INTERNAL_CR_NAME,
   DISASTER_RECOVERY_TARGET_ANNOTATION,
 } from '../../constants';
 import { WizardNodeState, WizardState } from '../create-storage-system/reducer';
@@ -77,9 +76,10 @@ export const getAllZone = (nodes: WizardNodeState[]): Set<string> =>
 export const getVendorDashboardLinkFromMetrics = (
   systemKind: string,
   systemName: string,
+  systemNamespace: string,
   subComponent?: string
 ) =>
-  `/odf/system/${systemKind}/${systemName}/overview${
+  `/odf/system/ns/${systemNamespace}/${systemKind}/${systemName}/overview${
     subComponent ? '/' + subComponent : ''
   }`;
 
@@ -368,6 +368,7 @@ type OCSRequestData = {
   isSingleReplicaPoolEnabled?: boolean;
   enableRDRPreparation?: boolean;
   odfNamespace: string;
+  storageClusterName: string;
 };
 
 export const getOCSRequestData = ({
@@ -389,6 +390,7 @@ export const getOCSRequestData = ({
   isSingleReplicaPoolEnabled,
   enableRDRPreparation,
   odfNamespace,
+  storageClusterName,
 }: OCSRequestData): StorageClusterKind => {
   const scName: string = storageClass.name;
   const isNoProvisioner: boolean = storageClass?.provisioner === NO_PROVISIONER;
@@ -405,7 +407,7 @@ export const getOCSRequestData = ({
     apiVersion: 'ocs.openshift.io/v1',
     kind: 'StorageCluster',
     metadata: {
-      name: OCS_INTERNAL_CR_NAME,
+      name: storageClusterName,
       namespace: odfNamespace,
     },
     spec: {},
diff --git a/packages/odf/constants/common.ts b/packages/odf/constants/common.ts
index 2d22ed935..49a6ee158 100644
--- a/packages/odf/constants/common.ts
+++ b/packages/odf/constants/common.ts
@@ -4,8 +4,6 @@ import { TFunction } from 'i18next';
 export const CEPH_BRAND_NAME = 'Red Hat Ceph Storage';
 export const NO_PROVISIONER = 'kubernetes.io/no-provisioner';
 export const STORAGE_CLUSTER_SYSTEM_KIND = 'storagecluster.ocs.openshift.io/v1';
-export const OCS_EXTERNAL_CR_NAME = 'ocs-external-storagecluster';
-export const OCS_INTERNAL_CR_NAME = 'ocs-storagecluster';
 export const HOSTNAME_LABEL_KEY = 'kubernetes.io/hostname';
 export const LABEL_OPERATOR = 'In';
 export const OCS_SUPPORT_ANNOTATION = 'features.ocs.openshift.io/enabled';
@@ -93,3 +91,5 @@ export enum TimeUnits {
   HOUR = 'Hour',
   MIN = 'Min',
 }
+
+export const reduxReducerScope = 'odfConsoleRedux';
diff --git a/packages/odf/features.ts b/packages/odf/features.ts
index 275274d50..38eca5f8d 100644
--- a/packages/odf/features.ts
+++ b/packages/odf/features.ts
@@ -18,6 +18,12 @@ import {
 } from '@openshift-console/dynamic-plugin-sdk';
 import * as _ from 'lodash-es';
 import { SECOND, RGW_PROVISIONER, NOOBAA_PROVISIONER } from './constants';
+import {
+  isMCGStandaloneCluster,
+  isExternalCluster,
+  isClusterIgnored,
+  isNFSEnabled,
+} from './utils';
 
 export const ODF_MODEL_FLAG = 'ODF_MODEL'; // Based on the existence of StorageSystem CRD
 export const OCS_INDEPENDENT_FLAG = 'OCS_INDEPENDENT'; // Set to "true" if it is external mode StorageCluster
@@ -54,6 +60,7 @@ const setOCSFlagsFalse = (setFlag: SetFeatureFlag) => {
 export const setODFFlag = (setFlag: SetFeatureFlag) =>
   setFlag(ODF_MODEL_FLAG, true);
 
+// ToDo (Sanjal): Remove usage of these "OCS" flags (moved them to redux in 4.15)
 export const setOCSFlags = async (setFlag: SetFeatureFlag) => {
   let ocsIntervalId = null;
   // to prevent unnecessary re-render every 15 sec
@@ -68,19 +75,24 @@ export const setOCSFlags = async (setFlag: SetFeatureFlag) => {
           requestInit: null,
         })) as StorageClusterKind[];
       if (storageClusters?.length > 0) {
-        const storageCluster = storageClusters.find(
-          (sc: StorageClusterKind) => sc.status.phase !== 'Ignored'
+        const internalStorageCluster = storageClusters.find(
+          (sc: StorageClusterKind) =>
+            !isClusterIgnored(sc) && !isExternalCluster(sc)
         );
-        const isInternal = _.isEmpty(storageCluster?.spec?.externalStorage);
-        setFlag(OCS_CONVERGED_FLAG, isInternal);
-        setFlag(OCS_INDEPENDENT_FLAG, !isInternal);
-        setFlag(OCS_FLAG, true);
-        setFlag(
-          MCG_STANDALONE,
-          storageCluster?.spec?.multiCloudGateway?.reconcileStrategy ===
-            'standalone'
+        const externalStorageCluster = storageClusters.find(
+          (sc: StorageClusterKind) =>
+            !isClusterIgnored(sc) && isExternalCluster(sc)
+        );
+        const mcgStorageCluster = storageClusters.find(
+          (sc: StorageClusterKind) =>
+            !isClusterIgnored(sc) && isMCGStandaloneCluster(sc)
         );
-        setFlag(OCS_NFS_ENABLED, storageCluster?.spec?.nfs?.enable === true);
+
+        setFlag(OCS_CONVERGED_FLAG, !!internalStorageCluster);
+        setFlag(OCS_INDEPENDENT_FLAG, !!externalStorageCluster);
+        setFlag(OCS_FLAG, true);
+        setFlag(MCG_STANDALONE, !!mcgStorageCluster);
+        setFlag(OCS_NFS_ENABLED, isNFSEnabled(internalStorageCluster));
         clearInterval(ocsIntervalId);
       } else if (setFlagFalse) {
         setFlagFalse = false;
@@ -203,6 +215,7 @@ export const detectComponents: FeatureDetector = async (
   let cephIntervalId = null;
   let noobaaIntervalId = null;
 
+  // ToDo (Sanjal): Remove usage of this "ceph" flag (moved it to redux in 4.15)
   const cephDetector = async () => {
     try {
       const cephClusters = (await k8sList({
diff --git a/packages/odf/modals/add-capacity/add-capacity-modal.tsx b/packages/odf/modals/add-capacity/add-capacity-modal.tsx
index c48c1c00d..2f34cb8e0 100644
--- a/packages/odf/modals/add-capacity/add-capacity-modal.tsx
+++ b/packages/odf/modals/add-capacity/add-capacity-modal.tsx
@@ -208,14 +208,21 @@ export const AddCapacityModal: React.FC<AddCapacityModalProps> = ({
 
   const { odfNamespace } = useODFNamespaceSelector();
 
+  const ocsClusterName = getName(ocsConfig);
   const [cephTotal, totalError, totalLoading] = useCustomPrometheusPoll({
     endpoint: 'api/v1/query' as PrometheusEndpoint,
-    query: CAPACITY_INFO_QUERIES[StorageDashboardQuery.RAW_CAPACITY_TOTAL],
+    query:
+      CAPACITY_INFO_QUERIES(ocsClusterName)[
+        StorageDashboardQuery.RAW_CAPACITY_TOTAL
+      ],
     basePath: usePrometheusBasePath(),
   });
   const [cephUsed, usedError, usedLoading] = useCustomPrometheusPoll({
     endpoint: 'api/v1/query' as PrometheusEndpoint,
-    query: CAPACITY_INFO_QUERIES[StorageDashboardQuery.RAW_CAPACITY_USED],
+    query:
+      CAPACITY_INFO_QUERIES(ocsClusterName)[
+        StorageDashboardQuery.RAW_CAPACITY_USED
+      ],
     basePath: usePrometheusBasePath(),
   });
   const [values, loading, loadError] = [
@@ -242,7 +249,7 @@ export const AddCapacityModal: React.FC<AddCapacityModalProps> = ({
   const [osdSize, unit] = osdSizeWithUnit.split(/(\d+)/).filter(Boolean);
   const osdSizeWithoutUnit: number = +osdSize / SIZE_IN_TB[unit];
   const isNoProvionerSC: boolean = storageClass?.provisioner === NO_PROVISIONER;
-  const selectedSCName: string = storageClass?.metadata?.name;
+  const selectedSCName: string = getName(storageClass);
   const deviceSetIndex: number = getCurrentDeviceSetIndex(
     deviceSets,
     selectedSCName
@@ -254,7 +261,7 @@ export const AddCapacityModal: React.FC<AddCapacityModalProps> = ({
     hasFlexibleScaling,
     createWizardNodeState(getCephNodes(nodesData, odfNamespace))
   );
-  const name = ocsConfig?.metadata?.name;
+
   const totalCapacityMetric = values?.[0];
   const usedCapacityMetric = values?.[1];
   const usedCapacity = humanizeBinaryBytes(usedCapacityMetric);
@@ -408,9 +415,13 @@ export const AddCapacityModal: React.FC<AddCapacityModalProps> = ({
     >
       <NamespaceSafetyBox>
         <ModalBody className="add-capacity-modal--overflow">
-          <Trans t={t as any} ns="plugin__odf-console" values={{ name }}>
-            Adding capacity for <strong>{{ name }}</strong>, may increase your
-            expenses.
+          <Trans
+            t={t as any}
+            ns="plugin__odf-console"
+            values={{ ocsClusterName }}
+          >
+            Adding capacity for <strong>{{ ocsClusterName }}</strong>, may
+            increase your expenses.
           </Trans>
           <FormGroup
             className="pf-u-pt-md pf-u-pb-sm"
diff --git a/packages/odf/queries/common.ts b/packages/odf/queries/common.ts
index af44af361..80980bc4c 100644
--- a/packages/odf/queries/common.ts
+++ b/packages/odf/queries/common.ts
@@ -3,8 +3,9 @@ export enum StorageDashboardQuery {
   RAW_CAPACITY_USED = 'RAW_CAPACITY_USED',
 }
 
-export const CAPACITY_INFO_QUERIES = {
-  [StorageDashboardQuery.RAW_CAPACITY_TOTAL]: 'ceph_cluster_total_bytes',
-  [StorageDashboardQuery.RAW_CAPACITY_USED]:
-    'ceph_cluster_total_used_raw_bytes',
-};
+// ToDo (epic 4422): This should work (for now) as "managedBy" will be unique,
+// but moving forward add a label to metric for CephCluster namespace and use that instead (update query).
+export const CAPACITY_INFO_QUERIES = (managedByOCS: string) => ({
+  [StorageDashboardQuery.RAW_CAPACITY_TOTAL]: `ceph_cluster_total_bytes{managedBy="${managedByOCS}"}`,
+  [StorageDashboardQuery.RAW_CAPACITY_USED]: `ceph_cluster_total_used_raw_bytes{managedBy="${managedByOCS}"}`,
+});
diff --git a/packages/odf/redux/actions/index.ts b/packages/odf/redux/actions/index.ts
index 311c45d9b..45a58f0e1 100644
--- a/packages/odf/redux/actions/index.ts
+++ b/packages/odf/redux/actions/index.ts
@@ -1 +1,2 @@
 export * from './odf-namespace';
+export * from './odf-system-flags';
diff --git a/packages/odf/redux/actions/odf-system-flags.ts b/packages/odf/redux/actions/odf-system-flags.ts
new file mode 100644
index 000000000..f5d872595
--- /dev/null
+++ b/packages/odf/redux/actions/odf-system-flags.ts
@@ -0,0 +1,33 @@
+import { action } from 'typesafe-actions';
+
+export type odfSystemFlagsPayload = {
+  systemFlags: {
+    [namespace: string]: {
+      odfSystemName: string;
+      ocsClusterName: string;
+      isInternalMode: boolean;
+      isExternalMode: boolean;
+      isNoobaaStandalone: boolean;
+      isNoobaaAvailable: boolean;
+      isCephAvailable: boolean;
+      isRGWAvailable: boolean;
+      isNFSEnabled: boolean;
+    };
+  };
+  areFlagsLoaded: boolean;
+  flagsLoadError: unknown;
+};
+
+export enum odfSystemFlagsActions {
+  SetODFSystemFlags = 'setODFSystemFlags',
+}
+
+export type odfSystemFlagsActionTypes = {
+  type: odfSystemFlagsActions;
+  payload: odfSystemFlagsPayload;
+};
+
+export const setODFSystemFlags = (
+  payload: odfSystemFlagsPayload
+): odfSystemFlagsActionTypes =>
+  action(odfSystemFlagsActions.SetODFSystemFlags, payload);
diff --git a/packages/odf/redux/combineReducers.ts b/packages/odf/redux/combineReducers.ts
index b38a95f9f..c5ab4e772 100644
--- a/packages/odf/redux/combineReducers.ts
+++ b/packages/odf/redux/combineReducers.ts
@@ -1,7 +1,11 @@
 import { combineReducers } from 'redux';
-import { odfNamespaceReducer } from './reducers';
-import { odfNamespaceReducerName } from './selectors';
+import { odfNamespaceReducer, odfSystemFlagsReducer } from './reducers';
+import {
+  odfNamespaceReducerName,
+  odfSystemFlagsReducerName,
+} from './selectors';
 
 export default combineReducers({
   [odfNamespaceReducerName]: odfNamespaceReducer,
+  [odfSystemFlagsReducerName]: odfSystemFlagsReducer,
 });
diff --git a/packages/odf/redux/dispatchers/index.ts b/packages/odf/redux/dispatchers/index.ts
index 311c45d9b..45a58f0e1 100644
--- a/packages/odf/redux/dispatchers/index.ts
+++ b/packages/odf/redux/dispatchers/index.ts
@@ -1 +1,2 @@
 export * from './odf-namespace';
+export * from './odf-system-flags';
diff --git a/packages/odf/redux/dispatchers/odf-system-flags.ts b/packages/odf/redux/dispatchers/odf-system-flags.ts
new file mode 100644
index 000000000..a9f220516
--- /dev/null
+++ b/packages/odf/redux/dispatchers/odf-system-flags.ts
@@ -0,0 +1,16 @@
+import { useCallback } from 'react';
+import { useDispatch } from 'react-redux';
+import { odfSystemFlagsPayload, setODFSystemFlags } from '../actions';
+
+type UseODFSystemFlagsDispatch = () => (payload: odfSystemFlagsPayload) => void;
+
+export const useODFSystemFlagsDispatch: UseODFSystemFlagsDispatch = () => {
+  const dispatch = useDispatch();
+
+  return useCallback(
+    (payload: odfSystemFlagsPayload) => {
+      dispatch(setODFSystemFlags(payload));
+    },
+    [dispatch]
+  );
+};
diff --git a/packages/odf/redux/provider-hooks/index.ts b/packages/odf/redux/provider-hooks/index.ts
index d7292f191..d89c89174 100644
--- a/packages/odf/redux/provider-hooks/index.ts
+++ b/packages/odf/redux/provider-hooks/index.ts
@@ -1 +1,2 @@
 export * from './useODFNamespace';
+export * from './useODFSystemFlags';
diff --git a/packages/odf/redux/provider-hooks/useODFNamespace.ts b/packages/odf/redux/provider-hooks/useODFNamespace.ts
index 59c269de5..c2b4d07a3 100644
--- a/packages/odf/redux/provider-hooks/useODFNamespace.ts
+++ b/packages/odf/redux/provider-hooks/useODFNamespace.ts
@@ -2,14 +2,13 @@ import * as React from 'react';
 import { SubscriptionModel } from '@odf/shared/models';
 import { getNamespace } from '@odf/shared/selectors';
 import { SubscriptionKind } from '@odf/shared/types';
+import { isAbortError } from '@odf/shared/utils';
 import { k8sList } from '@openshift-console/dynamic-plugin-sdk';
 import { useODFNamespaceDispatch } from '../dispatchers';
 
 const FALLBACK_NAMESPACE = 'openshift-storage';
 const SPEC_NAME = 'odf-operator';
 
-const isAbortError = (err): boolean => err?.name === 'AbortError';
-
 const namespaceDetector = async (maxAttempt = 5): Promise<string> => {
   let attempt = 0;
   let ns = null;
diff --git a/packages/odf/redux/provider-hooks/useODFSystemFlags.ts b/packages/odf/redux/provider-hooks/useODFSystemFlags.ts
new file mode 100644
index 000000000..de2fa0bad
--- /dev/null
+++ b/packages/odf/redux/provider-hooks/useODFSystemFlags.ts
@@ -0,0 +1,146 @@
+import * as React from 'react';
+import {
+  isMCGStandaloneCluster,
+  isExternalCluster,
+  isClusterIgnored,
+  isNFSEnabled,
+} from '@odf/core/utils';
+import {
+  CephClusterModel,
+  CephObjectStoreModel,
+  NooBaaSystemModel,
+  StorageClusterModel,
+} from '@odf/ocs/models';
+import { useDeepCompareMemoize } from '@odf/shared/hooks/deep-compare-memoize';
+import { ODFStorageSystem } from '@odf/shared/models';
+import {
+  getName,
+  getNamespace,
+  getOwnerReferences,
+} from '@odf/shared/selectors';
+import {
+  StorageClusterKind,
+  CephClusterKind,
+  NoobaaSystemKind,
+  K8sResourceKind,
+} from '@odf/shared/types';
+import { referenceForModel } from '@odf/shared/utils';
+import {
+  useK8sWatchResource,
+  WatchK8sResource,
+} from '@openshift-console/dynamic-plugin-sdk';
+import { odfSystemFlagsPayload } from '../actions';
+import { useODFSystemFlagsDispatch } from '../dispatchers';
+
+const storageClusterResource: WatchK8sResource = {
+  kind: referenceForModel(StorageClusterModel),
+  isList: true,
+};
+const cephClusterResource: WatchK8sResource = {
+  kind: referenceForModel(CephClusterModel),
+  isList: true,
+};
+const cephObjectStoreResource: WatchK8sResource = {
+  kind: referenceForModel(CephObjectStoreModel),
+  isList: true,
+};
+const noobaaResource: WatchK8sResource = {
+  kind: referenceForModel(NooBaaSystemModel),
+  isList: true,
+};
+
+type UseODFSystemFlagsPayload = {
+  scs: StorageClusterKind[];
+  ccs: CephClusterKind[];
+  coss: K8sResourceKind[];
+  nss: NoobaaSystemKind[];
+  allLoaded: boolean;
+  anyError: unknown;
+};
+
+const useODFSystemFlagsPayload = ({
+  scs,
+  ccs,
+  coss,
+  nss,
+  allLoaded,
+  anyError,
+}: UseODFSystemFlagsPayload): odfSystemFlagsPayload => {
+  const payload: odfSystemFlagsPayload = React.useMemo(() => {
+    if (allLoaded && !anyError) {
+      return scs?.reduce(
+        (acc: odfSystemFlagsPayload, sc) => {
+          if (!isClusterIgnored(sc)) {
+            const clusterNamespace = getNamespace(sc);
+            const ceph = ccs?.find(
+              (cc) => getNamespace(cc) === clusterNamespace
+            );
+            const cephObjStore = coss?.find(
+              (cos) => getNamespace(cos) === clusterNamespace
+            );
+            const noobaa = nss?.find(
+              (ns) => getNamespace(ns) === clusterNamespace
+            );
+
+            const odfSystemFlags = {
+              odfSystemName: getOwnerReferences(sc)?.find(
+                (o) => o.kind === ODFStorageSystem.kind
+              )?.name,
+              ocsClusterName: getName(sc),
+              isInternalMode: !isExternalCluster(sc),
+              isExternalMode: isExternalCluster(sc),
+              isNoobaaStandalone: isMCGStandaloneCluster(sc),
+              isNoobaaAvailable: !!noobaa,
+              isCephAvailable: !!ceph,
+              isRGWAvailable: !!cephObjStore,
+              isNFSEnabled: isNFSEnabled(sc),
+            };
+            acc.systemFlags[clusterNamespace] = odfSystemFlags;
+          }
+          return acc;
+        },
+        {
+          systemFlags: {},
+          areFlagsLoaded: allLoaded,
+          flagsLoadError: anyError,
+        } as odfSystemFlagsPayload
+      );
+    }
+    return {
+      systemFlags: {},
+      areFlagsLoaded: allLoaded,
+      flagsLoadError: anyError,
+    };
+  }, [scs, ccs, coss, nss, allLoaded, anyError]);
+
+  return useDeepCompareMemoize(payload);
+};
+
+export const useODFSystemFlags = (): void => {
+  const dispatch = useODFSystemFlagsDispatch();
+
+  const [scs, scLoaded, scError] = useK8sWatchResource<StorageClusterKind[]>(
+    storageClusterResource
+  );
+  const [ccs, ccLoaded, ccError] =
+    useK8sWatchResource<CephClusterKind[]>(cephClusterResource);
+  const [coss, cosLoaded, cosError] = useK8sWatchResource<K8sResourceKind[]>(
+    cephObjectStoreResource
+  );
+  const [nss, nsLoaded, nsError] =
+    useK8sWatchResource<NoobaaSystemKind[]>(noobaaResource);
+
+  const allLoaded = scLoaded && ccLoaded && cosLoaded && nsLoaded;
+  const anyError = scError || ccError || cosError || nsError;
+
+  const memoizedPayload = useODFSystemFlagsPayload({
+    scs,
+    ccs,
+    coss,
+    nss,
+    allLoaded,
+    anyError,
+  });
+
+  React.useEffect(() => dispatch(memoizedPayload), [dispatch, memoizedPayload]);
+};
diff --git a/packages/odf/redux/reducers/index.ts b/packages/odf/redux/reducers/index.ts
index 311c45d9b..45a58f0e1 100644
--- a/packages/odf/redux/reducers/index.ts
+++ b/packages/odf/redux/reducers/index.ts
@@ -1 +1,2 @@
 export * from './odf-namespace';
+export * from './odf-system-flags';
diff --git a/packages/odf/redux/reducers/odf-system-flags.ts b/packages/odf/redux/reducers/odf-system-flags.ts
new file mode 100644
index 000000000..8116cfacc
--- /dev/null
+++ b/packages/odf/redux/reducers/odf-system-flags.ts
@@ -0,0 +1,29 @@
+import { produce } from 'immer';
+import {
+  odfSystemFlagsActionTypes,
+  odfSystemFlagsPayload,
+  odfSystemFlagsActions,
+} from '../actions';
+
+const initialState: odfSystemFlagsPayload = {
+  systemFlags: {},
+  areFlagsLoaded: false,
+  flagsLoadError: undefined,
+};
+
+export const odfSystemFlagsReducer = (
+  odfNamespaceState = initialState,
+  action: odfSystemFlagsActionTypes
+): odfSystemFlagsPayload => {
+  const payload = action.payload;
+  switch (action.type) {
+    case odfSystemFlagsActions.SetODFSystemFlags:
+      return produce(odfNamespaceState, (draft) => {
+        draft.systemFlags = payload.systemFlags;
+        draft.areFlagsLoaded = payload.areFlagsLoaded;
+        draft.flagsLoadError = payload.flagsLoadError;
+      });
+    default:
+      return odfNamespaceState;
+  }
+};
diff --git a/packages/odf/redux/selectors/index.ts b/packages/odf/redux/selectors/index.ts
index 311c45d9b..45a58f0e1 100644
--- a/packages/odf/redux/selectors/index.ts
+++ b/packages/odf/redux/selectors/index.ts
@@ -1 +1,2 @@
 export * from './odf-namespace';
+export * from './odf-system-flags';
diff --git a/packages/odf/redux/selectors/odf-namespace.ts b/packages/odf/redux/selectors/odf-namespace.ts
index eb0673214..782928861 100644
--- a/packages/odf/redux/selectors/odf-namespace.ts
+++ b/packages/odf/redux/selectors/odf-namespace.ts
@@ -1,8 +1,8 @@
+import { reduxReducerScope } from '@odf/core/constants';
 import { useSelector } from 'react-redux';
 import { nsPayload } from '../actions';
 
 export const odfNamespaceReducerName = 'odfInstallNs';
-export const reduxReducerScope = 'odfConsoleRedux';
 
 const getODFNamespace = (state): nsPayload =>
   state.plugins?.[reduxReducerScope]?.[odfNamespaceReducerName] || {};
diff --git a/packages/odf/redux/selectors/odf-system-flags.ts b/packages/odf/redux/selectors/odf-system-flags.ts
new file mode 100644
index 000000000..e6446d976
--- /dev/null
+++ b/packages/odf/redux/selectors/odf-system-flags.ts
@@ -0,0 +1,11 @@
+import { reduxReducerScope } from '@odf/core/constants';
+import { useSelector } from 'react-redux';
+import { odfSystemFlagsPayload } from '../actions';
+
+export const odfSystemFlagsReducerName = 'odfSystemFlags';
+
+const getODFSystemFlags = (state): odfSystemFlagsPayload =>
+  state.plugins?.[reduxReducerScope]?.[odfSystemFlagsReducerName] || {};
+
+export const useODFSystemFlagsSelector = (): odfSystemFlagsPayload =>
+  useSelector(getODFSystemFlags);
diff --git a/packages/odf/resources.ts b/packages/odf/resources.ts
index 6dcb55dcb..ba7b18e68 100644
--- a/packages/odf/resources.ts
+++ b/packages/odf/resources.ts
@@ -26,7 +26,6 @@ import { WatchK8sResource } from '@openshift-console/dynamic-plugin-sdk';
 
 export const cephClusterResource: WatchK8sResource = {
   kind: referenceForModel(CephClusterModel),
-  namespaced: false,
   isList: true,
 };
 
@@ -81,7 +80,6 @@ export const nodesDiscoveriesResource: WatchK8sResource = {
 export const storageClusterResource: WatchK8sResource = {
   isList: true,
   kind: referenceForModel(OCSStorageClusterModel),
-  namespaced: false,
 };
 
 export const odfPodsResource: K8sResourceObj = (ns) => ({
diff --git a/packages/odf/utils/odf.ts b/packages/odf/utils/odf.ts
index 82a768e51..5d44af38e 100644
--- a/packages/odf/utils/odf.ts
+++ b/packages/odf/utils/odf.ts
@@ -1,6 +1,10 @@
+import { getNamespace } from '@odf/shared/selectors';
 import { ClusterServiceVersionKind } from '@odf/shared/types';
 import { K8sResourceKind } from '@odf/shared/types';
-import { StorageClassResourceKind } from '@odf/shared/types';
+import {
+  StorageClassResourceKind,
+  StorageClusterKind,
+} from '@odf/shared/types';
 import { isDefaultClass } from '@odf/shared/utils';
 import * as _ from 'lodash-es';
 import { ODF_VENDOR_ANNOTATION } from '../constants';
@@ -37,3 +41,35 @@ export const getStorageClassDescription = (
 
 export const getOperatorVersion = (operator: K8sResourceKind): string =>
   operator?.spec?.version;
+
+export const isMCGStandaloneCluster = (storageCluster: StorageClusterKind) => {
+  return (
+    storageCluster?.spec?.multiCloudGateway?.reconcileStrategy === 'standalone'
+  );
+};
+
+export const isExternalCluster = (storageCluster: StorageClusterKind) => {
+  return !_.isEmpty(storageCluster?.spec?.externalStorage);
+};
+
+export const isClusterIgnored = (storageCluster: StorageClusterKind) => {
+  return storageCluster?.status?.phase === 'Ignored';
+};
+
+export const isNFSEnabled = (storageCluster: StorageClusterKind) => {
+  return storageCluster?.spec?.nfs?.enable === true;
+};
+
+export const getStorageClusterInNs = (
+  storageClusters: StorageClusterKind[],
+  namespace: string
+) =>
+  storageClusters?.find(
+    (sc: StorageClusterKind) =>
+      !isClusterIgnored(sc) && getNamespace(sc) === namespace
+  );
+
+export const getResourceInNs = (
+  resources: K8sResourceKind[],
+  namespace: string
+) => resources?.find((r: K8sResourceKind) => getNamespace(r) === namespace);
diff --git a/packages/shared/src/dashboards/capacity-card/capacity-card.tsx b/packages/shared/src/dashboards/capacity-card/capacity-card.tsx
index cacd19ca9..88e3d466f 100644
--- a/packages/shared/src/dashboards/capacity-card/capacity-card.tsx
+++ b/packages/shared/src/dashboards/capacity-card/capacity-card.tsx
@@ -24,6 +24,7 @@ import './capacity-card.scss';
 
 export type CapacityMetricDatum = {
   name: string;
+  namespace?: string;
   managedSystemName?: string;
   managedSystemKind?: string;
   totalValue?: HumanizeResult;
@@ -184,7 +185,11 @@ const CapacityCardRow: React.FC<CapacityCardRowProps> = ({
         {data?.managedSystemKind ? (
           <Tooltip content={data?.name}>
             <ResourceLink
-              link={getDashboardLink(data?.managedSystemKind, data?.name)}
+              link={getDashboardLink(
+                data?.managedSystemKind,
+                data?.name,
+                data?.namespace
+              )}
               resourceModel={resourceModel}
               resourceName={data?.name}
               className="odf-capacityCardLink--ellipsis"
@@ -317,7 +322,7 @@ const CapacityCard: React.FC<CapacityCardProps> = ({
             const isPercentage = !!item?.totalValue;
             return (
               <CapacityCardRow
-                key={item.name}
+                key={item.name + item.namespace}
                 data={item}
                 isPercentage={isPercentage}
                 isRelative={relative}
diff --git a/packages/shared/src/dashboards/status-card/states.tsx b/packages/shared/src/dashboards/status-card/states.tsx
index b3278d82d..c1eff4ac3 100644
--- a/packages/shared/src/dashboards/status-card/states.tsx
+++ b/packages/shared/src/dashboards/status-card/states.tsx
@@ -102,6 +102,18 @@ export const healthStateMapping: {
   },
 };
 
+export const STATE_PRIORITY = [
+  HealthState.NOT_AVAILABLE,
+  HealthState.LOADING,
+  HealthState.ERROR,
+  HealthState.WARNING,
+  HealthState.UPGRADABLE,
+  HealthState.UPDATING,
+  HealthState.PROGRESS,
+  HealthState.UNKNOWN,
+  HealthState.OK,
+];
+
 export type HealthStateMappingValues = {
   icon: React.ReactNode;
   priority: number;
diff --git a/packages/shared/src/modals/DeleteModal.tsx b/packages/shared/src/modals/DeleteModal.tsx
index b31231926..425e4cd68 100644
--- a/packages/shared/src/modals/DeleteModal.tsx
+++ b/packages/shared/src/modals/DeleteModal.tsx
@@ -43,7 +43,7 @@ const DeleteModal: React.FC<CommonModalProps<DeleteModalExtraProps>> = ({
     }
     k8sList<ClusterServiceVersionKind>({
       model: ClusterServiceVersionModel,
-      queryParams: { namespace },
+      queryParams: { ns: namespace },
       requestInit: null,
     })
       .then((data) => {
diff --git a/packages/shared/src/selectors/k8s.ts b/packages/shared/src/selectors/k8s.ts
index 6d87f971b..82eda1657 100644
--- a/packages/shared/src/selectors/k8s.ts
+++ b/packages/shared/src/selectors/k8s.ts
@@ -41,3 +41,13 @@ export const getAnnotations = <A extends K8sResourceCommon = K8sResourceCommon>(
 export const getAPIVersion = <A extends K8sResourceCommon = K8sResourceCommon>(
   value: A
 ) => _.get(value, 'apiVersion') as K8sResourceCommon['apiVersion'];
+
+export const getOwnerReferences = <
+  A extends K8sResourceCommon = K8sResourceCommon
+>(
+  value: A
+) =>
+  _.get(
+    value,
+    'metadata.ownerReferences'
+  ) as K8sResourceCommon['metadata']['ownerReferences'];
diff --git a/packages/shared/src/types/storage.ts b/packages/shared/src/types/storage.ts
index b014d2074..99a40f83f 100644
--- a/packages/shared/src/types/storage.ts
+++ b/packages/shared/src/types/storage.ts
@@ -119,3 +119,5 @@ export type CephClusterKind = K8sResourceCommon & {
     phase?: string;
   };
 };
+
+export type NoobaaSystemKind = K8sResourceCommon;
diff --git a/packages/shared/src/utils/common.ts b/packages/shared/src/utils/common.ts
index da08e214f..b07f5c321 100644
--- a/packages/shared/src/utils/common.ts
+++ b/packages/shared/src/utils/common.ts
@@ -120,8 +120,10 @@ export const referenceForOwnerRef = (
     groupVersionFor(ownerRef.apiVersion).version
   )(ownerRef.kind);
 
-export const isFunctionThenApply = (fn: any) => (args: string) =>
-  typeof fn === 'function' ? fn(args) : fn;
+export const isFunctionThenApply =
+  (fn: any) =>
+  (...args) =>
+    typeof fn === 'function' ? fn(...args) : fn;
 
 export const getInfrastructurePlatform = (
   infrastructure: K8sResourceKind
@@ -142,3 +144,5 @@ export const isValidIP = (address) =>
 
 export const getValidatedProp = (error: boolean) =>
   error ? 'error' : 'default';
+
+export const isAbortError = (err): boolean => err?.name === 'AbortError';
diff --git a/packages/shared/src/utils/dashboard.ts b/packages/shared/src/utils/dashboard.ts
index a5540d882..ddba15c2a 100644
--- a/packages/shared/src/utils/dashboard.ts
+++ b/packages/shared/src/utils/dashboard.ts
@@ -8,8 +8,12 @@ import { TFunction } from 'i18next';
 
 const DASH_PREFIX = '/odf/system';
 
-export const getDashboardLink = (systemKind: string, systemName: string) =>
-  `${DASH_PREFIX}/${systemKind}/${systemName}/overview`;
+export const getDashboardLink = (
+  systemKind: string,
+  systemName: string,
+  systemNamespace: string
+) =>
+  `${DASH_PREFIX}/ns/${systemNamespace}/${systemKind}/${systemName}/overview`;
 
 export const getWorstStatus = (
   componentsHealth: SubsystemHealth[],
diff --git a/plugins/odf/console-extensions.json b/plugins/odf/console-extensions.json
index 97904508a..4ad1a4546 100644
--- a/plugins/odf/console-extensions.json
+++ b/plugins/odf/console-extensions.json
@@ -62,6 +62,14 @@
       }
     }
   },
+  {
+    "type": "console.flag/hookProvider",
+    "properties": {
+      "handler": {
+        "$codeRef": "odfReduxReducers.useODFSystemFlags"
+      }
+    }
+  },
   {
     "type": "console.navigation/href",
     "properties": {
@@ -133,7 +141,7 @@
     "type": "console.page/route",
     "properties": {
       "exact": true,
-      "path": "/odf/system/ocs.openshift.io~v1~StorageCluster/:systemName/ceph.rook.io~v1~CephBlockPool/create/~new",
+      "path": "/odf/system/ns/:namespace/ocs.openshift.io~v1~StorageCluster/:systemName/ceph.rook.io~v1~CephBlockPool/create/~new",
       "component": {
         "$codeRef": "createBlockPools.default"
       }
@@ -142,7 +150,7 @@
   {
     "type": "console.page/route",
     "properties": {
-      "path": "/odf/system/ocs.openshift.io~v1~StorageCluster/:systemName/ceph.rook.io~v1~CephBlockPool/:poolName",
+      "path": "/odf/system/ns/:namespace/ocs.openshift.io~v1~StorageCluster/:systemName/ceph.rook.io~v1~CephBlockPool/:poolName",
       "exact": false,
       "component": {
         "$codeRef": "blockPoolDetailsPage.default"
@@ -212,7 +220,7 @@
   {
     "type": "console.page/route",
     "properties": {
-      "path": "/odf/system/ocs.openshift.io~v1~StorageCluster/:systemName",
+      "path": "/odf/system/ns/:namespace/ocs.openshift.io~v1~StorageCluster/:systemName",
       "exact": false,
       "component": {
         "$codeRef": "ocs.default"