diff --git a/omec/omec-upf-pfcp-agent/templates/_helpers.tpl b/omec/omec-upf-pfcp-agent/templates/_helpers.tpl
new file mode 100644
index 0000000..78f0582
--- /dev/null
+++ b/omec/omec-upf-pfcp-agent/templates/_helpers.tpl
@@ -0,0 +1,48 @@
+{{- /*
+
+# Copyright 2020-present Open Networking Foundation
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+*/ -}}
+
+{{/*
+Renders a set of standardised labels.
+*/}}
+{{- define "omec-upf-pfcp-agent.metadata_labels" -}}
+{{- $application := index . 0 -}}
+{{- $context := index . 1 -}}
+release: {{ $context.Release.Name }}
+app: {{ $application }}
+{{- end -}}
+
+{{/*
+Render the given template.
+*/}}
+{{- define "omec-upf-pfcp-agent.template" -}}
+{{- $name := index . 0 -}}
+{{- $context := index . 1 -}}
+{{- $last := base $context.Template.Name }}
+{{- $wtf := $context.Template.Name | replace $last $name -}}
+{{ include $wtf $context }}
+{{- end -}}
+
+{{/*
+Render init container for coredump.
+*/}}
+{{- define "omec-upf-pfcp-agent.coredump_init" -}}
+{{- $pod := index . 0 -}}
+{{- $context := index . 1 -}}
+- name: {{ $pod }}-coredump-init
+  image: {{ $context.Values.images.tags.init | quote }}
+  imagePullPolicy: {{ $context.Values.images.pullPolicy }}
+  securityContext:
+    privileged: true
+    runAsUser: 0
+  command: ["bash", "-xc"]
+  args:
+    - echo '/tmp/coredump/core.%h.%e.%t' > /mnt/host-rootfs/proc/sys/kernel/core_pattern
+  volumeMounts:
+    - name: host-rootfs
+      mountPath: /mnt/host-rootfs
+{{- end -}}
diff --git a/omec/omec-upf-pfcp-agent/templates/configmap-pfcp-agent.yaml b/omec/omec-upf-pfcp-agent/templates/configmap-pfcp-agent.yaml
new file mode 100644
index 0000000..53f8116
--- /dev/null
+++ b/omec/omec-upf-pfcp-agent/templates/configmap-pfcp-agent.yaml
@@ -0,0 +1,17 @@
+{{/*
+# Copyright 2020-present Open Networking Foundation
+
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+*/}}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: pfcp
+  labels:
+{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
+data:
+{{- range $key, $value := .Values.config.pfcp.cfgFiles }}
+  {{ $key }}: {{ toJson $value | quote }}
+{{- end }}
diff --git a/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml b/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
new file mode 100644
index 0000000..a8e8bf3
--- /dev/null
+++ b/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
@@ -0,0 +1,32 @@
+{{/*
+# Copyright 2020-present Open Networking Foundation
+
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+*/}}
+
+---
+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 }}
+spec:
+  type: ClusterIP
+  selector:
+{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
+  ports:
+  - name: pfcp
+    port: 8805
+    protocol: UDP
diff --git a/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml b/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml
new file mode 100644
index 0000000..56f6273
--- /dev/null
+++ b/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml
@@ -0,0 +1,72 @@
+{{/*
+# Copyright 2020-present Open Networking Foundation
+
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+*/}}
+
+{{- $upfConfig := index .Values.config.pfcp.cfgFiles "upf.json" }}
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: pfcp
+  labels:
+{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
+spec:
+  replicas: 1
+  serviceName: pfcp-headless
+  selector:
+    matchLabels:
+{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 6 }}
+  template:
+    metadata:
+      labels:
+{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 8 }}
+    spec:
+      shareProcessNamespace: true
+    {{- if .Values.nodeSelectors.enabled }}
+      nodeSelector:
+        {{ .Values.nodeSelectors.pfcp.label }}: {{ .Values.nodeSelectors.pfcp.value }}
+    {{- end }}
+    {{- if .Values.config.coreDump.enabled }}
+{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.coredump_init" | indent 8 }}
+    {{- end }}
+      containers:
+      - name: pfcp-agent
+        image: {{ .Values.images.tags.pfcpiface | quote }}
+        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
+        env:
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        command: ["pfcpiface"]
+        args:
+          - -config
+          - /opt/bess/bessctl/conf/upf.json
+          - -n4SrcIPStr
+          - $(POD_IP)
+          - -p4RtcServerIP
+          - {{ .Values.config.pfcp.p4RtcServer.addr }}
+          - -p4RtcServerPort
+          - {{ .Values.config.pfcp.p4RtcServer.port | quote }}
+      {{- if .Values.resources.enabled }}
+        resources:
+{{ toYaml .Values.resources.pfcpiface | indent 10 }}
+      {{- end }}
+        volumeMounts:
+          - name: configs
+            mountPath: /tmp/conf
+      volumes:
+      - name: configs
+        configMap:
+          name: pfcp
+          defaultMode: 493
+    {{- if .Values.config.coreDump.enabled }}
+      - name: host-rootfs
+        hostPath:
+          path: /
+      - name: coredump
+        hostPath:
+          path: {{ .Values.config.coreDump.path }}
+    {{- end }}