diff --git a/docs/draft/howto/consuming-metrics.md b/docs/draft/howto/consuming-metrics.md
index ccefbee6c..78b41c2da 100644
--- a/docs/draft/howto/consuming-metrics.md
+++ b/docs/draft/howto/consuming-metrics.md
@@ -252,6 +252,7 @@ spec:
   selector:
     matchLabels:
       apps.kubernetes.io/name: operator-controller
+  serviceDiscoveryRole: EndpointSlice
 EOF
 ```
 
@@ -294,6 +295,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: catalogd
+  serviceDiscoveryRole: EndpointSlice
 EOF
 ```
 
diff --git a/helm/olmv1/templates/rbac/role-olmv1-system-metrics-monitor-role.yml b/helm/olmv1/templates/rbac/role-olmv1-system-metrics-monitor-role.yml
index 0a452d6b9..0cf8ee17a 100644
--- a/helm/olmv1/templates/rbac/role-olmv1-system-metrics-monitor-role.yml
+++ b/helm/olmv1/templates/rbac/role-olmv1-system-metrics-monitor-role.yml
@@ -21,5 +21,13 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 {{- end -}}
 {{- end -}}
diff --git a/helm/olmv1/templates/servicemonitor-olmv1-system-metrics-monitor.yml b/helm/olmv1/templates/servicemonitor-olmv1-system-metrics-monitor.yml
index a5bb357c3..ab8c43822 100644
--- a/helm/olmv1/templates/servicemonitor-olmv1-system-metrics-monitor.yml
+++ b/helm/olmv1/templates/servicemonitor-olmv1-system-metrics-monitor.yml
@@ -29,5 +29,6 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "olmv1.label.name" . }}
+  serviceDiscoveryRole: EndpointSlice
 {{- end -}}
 {{- end -}}
diff --git a/helm/prometheus/templates/servicemonitor-catalogd-controller-manager-metrics-monitor.yml b/helm/prometheus/templates/servicemonitor-catalogd-controller-manager-metrics-monitor.yml
index b3fd49854..cbf8d1def 100644
--- a/helm/prometheus/templates/servicemonitor-catalogd-controller-manager-metrics-monitor.yml
+++ b/helm/prometheus/templates/servicemonitor-catalogd-controller-manager-metrics-monitor.yml
@@ -31,3 +31,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: catalogd
+  serviceDiscoveryRole: EndpointSlice
diff --git a/helm/prometheus/templates/servicemonitor-kubelet.yml b/helm/prometheus/templates/servicemonitor-kubelet.yml
index 18d078a1f..ef577c003 100644
--- a/helm/prometheus/templates/servicemonitor-kubelet.yml
+++ b/helm/prometheus/templates/servicemonitor-kubelet.yml
@@ -43,3 +43,4 @@ spec:
   selector:
     matchLabels:
       k8s-app: kubelet
+  serviceDiscoveryRole: EndpointSlice
diff --git a/helm/prometheus/templates/servicemonitor-operator-controller-controller-manager-metrics-monitor.yml b/helm/prometheus/templates/servicemonitor-operator-controller-controller-manager-metrics-monitor.yml
index b77a090b2..e293a2d11 100644
--- a/helm/prometheus/templates/servicemonitor-operator-controller-controller-manager-metrics-monitor.yml
+++ b/helm/prometheus/templates/servicemonitor-operator-controller-controller-manager-metrics-monitor.yml
@@ -31,3 +31,4 @@ spec:
   selector:
     matchLabels:
       control-plane: operator-controller-controller-manager
+  serviceDiscoveryRole: EndpointSlice
diff --git a/openshift/catalogd/manifests-experimental.yaml b/openshift/catalogd/manifests-experimental.yaml
index 6d35355b3..d46d31157 100644
--- a/openshift/catalogd/manifests-experimental.yaml
+++ b/openshift/catalogd/manifests-experimental.yaml
@@ -693,6 +693,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 ---
 # Source: olmv1/templates/openshift/rolebinding-openshift-config-manager-rolebinding.yml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1084,3 +1092,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: catalogd
+  serviceDiscoveryRole: EndpointSlice
diff --git a/openshift/catalogd/manifests.yaml b/openshift/catalogd/manifests.yaml
index 124406c76..57dfeb91f 100644
--- a/openshift/catalogd/manifests.yaml
+++ b/openshift/catalogd/manifests.yaml
@@ -693,6 +693,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 ---
 # Source: olmv1/templates/openshift/rolebinding-openshift-config-manager-rolebinding.yml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1083,3 +1091,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: catalogd
+  serviceDiscoveryRole: EndpointSlice
diff --git a/openshift/operator-controller/manifests-experimental.yaml b/openshift/operator-controller/manifests-experimental.yaml
index 4a8151592..5e76236d1 100644
--- a/openshift/operator-controller/manifests-experimental.yaml
+++ b/openshift/operator-controller/manifests-experimental.yaml
@@ -1021,6 +1021,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 ---
 # Source: olmv1/templates/rbac/role-olmv1-system-operator-controller-manager-role.yml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1366,3 +1374,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: operator-controller
+  serviceDiscoveryRole: EndpointSlice
diff --git a/openshift/operator-controller/manifests.yaml b/openshift/operator-controller/manifests.yaml
index 529c0f648..9f4ed50fa 100644
--- a/openshift/operator-controller/manifests.yaml
+++ b/openshift/operator-controller/manifests.yaml
@@ -929,6 +929,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 ---
 # Source: olmv1/templates/rbac/role-olmv1-system-operator-controller-manager-role.yml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1268,3 +1276,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: operator-controller
+  serviceDiscoveryRole: EndpointSlice