diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index d5b7fb81..8981918f 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 4.5.17
+version: 4.5.18
 appVersion: 28.0.2
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
diff --git a/charts/nextcloud/templates/metrics/servicemonitor.yaml b/charts/nextcloud/templates/metrics/servicemonitor.yaml
index e007784c..935f8857 100644
--- a/charts/nextcloud/templates/metrics/servicemonitor.yaml
+++ b/charts/nextcloud/templates/metrics/servicemonitor.yaml
@@ -25,8 +25,12 @@ spec:
       app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/component: metrics
   namespaceSelector:
+    {{- with .Values.metrics.serviceMonitor.namespaceSelector }}
+    {{- toYaml . | nindent 4 }}
+    {{- else }}
     matchNames:
       - {{ .Release.Namespace | quote }}
+    {{- end }}
   endpoints:
     - port: metrics
       path: "/"
diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
index 0d2d9368..1baf1099 100644
--- a/charts/nextcloud/values.yaml
+++ b/charts/nextcloud/values.yaml
@@ -517,6 +517,9 @@ metrics:
     ##
     namespace: ""
 
+    ## @param metrics.serviceMonitor.namespaceSelector where service are to discoverd (default release namespace)
+    namespaceSelector:
+
     ## @param metrics.serviceMonitor.jobLabel The name of the label on the target service to use as the job name in prometheus.
     ##
     jobLabel: ""