diff --git a/playbooks/openshift-apps/application-monitoring.yml b/playbooks/openshift-apps/application-monitoring.yml
index 8d3eaa8579..03c26953f9 100644
--- a/playbooks/openshift-apps/application-monitoring.yml
+++ b/playbooks/openshift-apps/application-monitoring.yml
@@ -19,7 +19,10 @@
 
   post_tasks:
   - name: Apply node labels
-    command: oc label --overwrite namespace application-monitoring monitoring-key=middleware
+    command: oc label --overwrite namespace application-monitoring monitoring-key=cpe
+
+  - name: Apply node labels for bodhi POC
+    command: oc label --overwrite namespace bodhi monitoring-key=cpe
 
   - name: Copy files
     copy: src={{roles_path}}/openshift-apps/application-monitoring/files/ dest=/etc/openshift_apps/application-monitoring/
diff --git a/roles/openshift-apps/application-monitoring/files/prometheus-operator/example/rbac/prometheus/prometheus.yaml b/roles/openshift-apps/application-monitoring/files/prometheus-operator/example/rbac/prometheus/prometheus.yaml
index 20f10a1423..862d1d66df 100644
--- a/roles/openshift-apps/application-monitoring/files/prometheus-operator/example/rbac/prometheus/prometheus.yaml
+++ b/roles/openshift-apps/application-monitoring/files/prometheus-operator/example/rbac/prometheus/prometheus.yaml
@@ -7,9 +7,12 @@ metadata:
 spec:
   replicas: 2
   serviceAccountName: prometheus
+  serviceMonitorNamespaceSelector:
+    matchLabels:
+      monitoring-key: cpe
   serviceMonitorSelector:
     matchLabels:
-      team: frontend
+      monitoring-key: cpe
   alerting:
     alertmanagers:
     - namespace: application-monitoring
diff --git a/roles/openshift-apps/bodhi/files/servicemonitor.yml b/roles/openshift-apps/bodhi/files/servicemonitor.yml
index 53d2f7bd29..d422391853 100644
--- a/roles/openshift-apps/bodhi/files/servicemonitor.yml
+++ b/roles/openshift-apps/bodhi/files/servicemonitor.yml
@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    monitoring-key: 'middleware'
+    monitoring-key: 'cpe'
   name: bodhi-web
 spec:
   endpoints: