diff --git a/omec/5g-control-plane/templates/service-pcf.yaml b/omec/5g-control-plane/templates/service-pcf.yaml
index 69724df..1f9f7c4 100644
--- a/omec/5g-control-plane/templates/service-pcf.yaml
+++ b/omec/5g-control-plane/templates/service-pcf.yaml
@@ -13,40 +13,16 @@
   labels:
 {{ tuple "pcf" . | include "5g-control-plane.metadata_labels" | indent 4 }}
 spec:
-  type: ClusterIP
+  type: {{ .Values.config.pcf.serviceType }}
   selector:
 {{ tuple "pcf" . | include "5g-control-plane.metadata_labels" | indent 4 }}
   ports:
-  - name: prometheus-exporter
-    port: {{ .Values.config.pcf.prometheus.port }}
-    protocol: TCP
   - name: sbi
     port: {{ .Values.config.pcf.sbi.port }}
     protocol: TCP
-{{- if or .Values.config.pcf.prometheus.nodePort.enabled .Values.config.pcf.sbi.nodePort.enabled }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: pcf-external
-  labels:
-{{ tuple "pcf" . | include "5g-control-plane.metadata_labels" | indent 4 }}
-spec:
-  type: NodePort
-  selector:
-{{ tuple "pcf" . | include "5g-control-plane.metadata_labels" | indent 4 }}
-  ports:
-{{- if .Values.config.pcf.prometheus.nodePort.enabled }}
-  - name: prometheus-exporter
-    port: {{ .Values.config.pcf.prometheus.port }}
-    protocol: TCP
-    nodePort: {{ .Values.config.pcf.prometheus.nodePort.port }}
-{{- end }}
-{{- if .Values.config.pcf.sbi.nodePort.enabled }}
-  - name: sbi
-    port: {{ .Values.config.pcf.sbi.port }}
-    protocol: TCP
-    nodePort: {{ .Values.config.pcf.sbi.nodePort.port }}
+{{- if eq .Values.config.pcf.serviceType "NodePort" }}
+{{- if .Values.config.pcf.sbi.nodePort }}
+    nodePort: {{ .Values.config.pcf.sbi.nodePort }}
 {{- end }}
 {{- end }}
 {{- end }}