diff --git a/omec/omec-user-plane/templates/_helpers.tpl b/omec/omec-user-plane/templates/_helpers.tpl
index 56f80d7..f2d1a61 100644
--- a/omec/omec-user-plane/templates/_helpers.tpl
+++ b/omec/omec-user-plane/templates/_helpers.tpl
@@ -34,7 +34,7 @@
 {{- $pod := index . 0 -}}
 {{- $context := index . 1 -}}
 - name: {{ $pod }}-coredump-init
-  image: {{ $context.Values.images.tags.init | quote }}
+  image: {{ $context.Values.images.tags.tools | quote }}
   imagePullPolicy: {{ $context.Values.images.pullPolicy }}
   securityContext:
     privileged: true
diff --git a/omec/omec-user-plane/templates/statefulset-upf.yaml b/omec/omec-user-plane/templates/statefulset-upf.yaml
index 050f0aa..f933a5f 100644
--- a/omec/omec-user-plane/templates/statefulset-upf.yaml
+++ b/omec/omec-user-plane/templates/statefulset-upf.yaml
@@ -68,11 +68,11 @@
             - NET_ADMIN
         resources:
           limits:
-            cpu: 256m
-            memory: 128Mi
+            cpu: 128m
+            memory: 64Mi
           requests:
-            cpu: 256m
-            memory: 128Mi
+            cpu: 128m
+            memory: 64Mi
     {{- if .Values.config.coreDump.enabled }}
 {{ tuple "upf" . | include "omec-user-plane.coredump_init" | indent 6 }}
     {{- end }}
@@ -175,7 +175,7 @@
         resources:
 {{ toYaml .Values.resources.web | indent 10 }}
       {{- end }}
-      - name: cpiface
+      - name: pfcp-agent
         image: {{ .Values.images.tags.pfcpiface | quote }}
         imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
         command: ["pfcpiface"]
@@ -191,6 +191,26 @@
             mountPath: /pod-share
           - name: configs
             mountPath: /tmp/conf
+    {{- if .Values.config.gratuitousArp.enabled }}
+      - name: arping
+        image: {{ .Values.images.tags.tools | quote }}
+        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
+        command: ["sh", "-xec"]
+        args:
+          - |
+            while true; do
+              arping -c 3 -A -I {{ index $accessConfig "ifname" }} {{ (split "/" .Values.config.upf.access.ip)._0 }}
+              arping -c 3 -A -I {{ index $coreConfig "ifname" }} {{ (split "/" .Values.config.upf.core.ip)._0 }}
+              sleep {{ .Values.config.gratuitousArp.interval }}
+            done
+        resources:
+          limits:
+            cpu: 128m
+            memory: 64Mi
+          requests:
+            cpu: 128m
+            memory: 64Mi
+    {{- end }}
       volumes:
       - name: configs
         configMap: