diff --git a/omec/omec-user-plane/Chart.yaml b/omec/omec-user-plane/Chart.yaml
index bc79c96..6c68b3c 100644
--- a/omec/omec-user-plane/Chart.yaml
+++ b/omec/omec-user-plane/Chart.yaml
@@ -7,4 +7,4 @@
 name: omec-user-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.3.6
+version: 0.3.7
diff --git a/omec/omec-user-plane/templates/service-upf.yaml b/omec/omec-user-plane/templates/service-upf.yaml
index dfc7b9b..21b727b 100644
--- a/omec/omec-user-plane/templates/service-upf.yaml
+++ b/omec/omec-user-plane/templates/service-upf.yaml
@@ -45,3 +45,17 @@
     protocol: TCP
     port: 8000
     nodePort: {{ .Values.config.upf.bess.web.nodePort }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: upf-metrics
+  labels:
+{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
+spec:
+  selector:
+{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
+  ports:
+  - name: prometheus-exporter
+    protocol: TCP
+    port: 8808
diff --git a/omec/omec-user-plane/templates/servicemonitor-upf.yaml b/omec/omec-user-plane/templates/servicemonitor-upf.yaml
new file mode 100644
index 0000000..3d4e8d1
--- /dev/null
+++ b/omec/omec-user-plane/templates/servicemonitor-upf.yaml
@@ -0,0 +1,21 @@
+{{/*
+# Copyright 2020-present Open Networking Foundation
+
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+*/}}
+{{- if .Values.servicemonitor.enabled }}
+---
+apiVersion: v1
+items:
+- apiVersion: monitoring.coreos.com/v1
+  kind: ServiceMonitor
+  metadata:
+    name: upf
+  spec:
+    endpoints:
+    - path: /metrics
+      port: prometheus-exporter
+    selector:
+      matchLabels:
+{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 8 }}
+{{- end }}
diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
index 60f1448..ab6421f 100644
--- a/omec/omec-user-plane/values.yaml
+++ b/omec/omec-user-plane/values.yaml
@@ -92,3 +92,6 @@
     cpiface:
       # pfcp or zmq
       mode: pfcp
+
+servicemonitor:
+  enabled: false