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 a8e8bf3..a1f956b 100644
--- a/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
+++ b/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
@@ -8,17 +8,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: pfcp-headless
-  labels:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
-spec:
-  clusterIP: None
-  selector:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
----
-apiVersion: v1
-kind: Service
-metadata:
   name: pfcp-agent
   labels:
 {{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
@@ -30,3 +19,21 @@
   - 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 }}
+{{- end }}