diff --git a/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml b/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
index a1f956b..2a4f1eb 100644
--- a/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
+++ b/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
@@ -11,29 +11,19 @@
   name: pfcp-agent
   labels:
 {{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
-spec:
-  type: ClusterIP
-  selector:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
-  ports:
-  - name: pfcp
-    port: 8805
-    protocol: UDP
-{{- if .Values.config.nodePort.enabled }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: pfcp-agent-external
-  labels:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
-spec:
-  type: NodePort
-  selector:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
-  ports:
-  - name: pfcp
-    port: 8805
-    protocol: UDP
-    nodePort: {{ .Values.config.nodePort.port }}
+{{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
 {{- end }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if .Values.service.externalIp }}
+  externalIPs:
+    - {{ .Values.service.externalIp }}
+{{- end }}
+  selector:
+{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
+  ports:
+  - name: pfcp
+    port: 8805
+    protocol: UDP