diff --git a/omec/omec-user-plane/templates/service-upf.yaml b/omec/omec-user-plane/templates/service-upf.yaml
index fa3d897..321197e 100644
--- a/omec/omec-user-plane/templates/service-upf.yaml
+++ b/omec/omec-user-plane/templates/service-upf.yaml
@@ -12,6 +12,7 @@
   labels:
 {{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
 spec:
+  type: {{ .Values.service.type }}
   selector:
 {{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
   ports:
@@ -22,29 +23,17 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: upf-external
+  name: upf-http
   labels:
 {{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
 spec:
+  type: {{ .Values.service.type }}
   selector:
 {{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
-  type: NodePort
   ports:
   - name: bess-web
     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: 8080