diff --git a/frontend/packages/console-app/src/queries.ts b/frontend/packages/console-app/src/queries.ts
index 44e5562688f..a6958623b42 100644
--- a/frontend/packages/console-app/src/queries.ts
+++ b/frontend/packages/console-app/src/queries.ts
@@ -14,8 +14,9 @@ import { PodModel } from '@console/internal/models';
 export const API_SERVERS_UP =
   '(sum(up{job="apiserver"} == 1) / count(kube_pod_labels{label_app="openshift-kube-apiserver",label_apiserver="true",namespace="openshift-kube-apiserver"})) * 100';
 export const CONTROLLER_MANAGERS_UP =
-  '(sum(up{job="kube-controller-manager"} == 1) / count(up{job="kube-controller-manager"})) * 100';
-export const SCHEDULERS_UP = '(sum(up{job="scheduler"} == 1) / count(up{job="scheduler"})) * 100';
+  '(sum(up{job="kube-controller-manager",namespace="openshift-kube-controller-manager"} == 1) / count(up{job="kube-controller-manager",namespace="openshift-kube-controller-manager"})) * 100';
+export const SCHEDULERS_UP =
+  '(sum(up{job="scheduler",namespace="openshift-kube-scheduler"} == 1) / count(up{job="scheduler",namespace="openshift-kube-scheduler"})) * 100';
 export const API_SERVER_REQUESTS_SUCCESS =
   '(1 - (sum(rate(apiserver_request_total{code=~"5.."}[5m])) or vector(0))/ sum(rate(apiserver_request_total[5m]))) * 100';