diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
index 5877ed7..648dca7 100644
--- a/omec/omec-user-plane/values.yaml
+++ b/omec/omec-user-plane/values.yaml
@@ -6,7 +6,8 @@
   tags:
     init: docker.io/omecproject/pod-init:1.0.0
     bess: docker.io/omecproject/upf-epc-bess:master-latest
-    cpiface: docker.io/omecproject/upf-epc-cpiface:master-latest
+    pfcpiface: docker.io/omecproject/upf-epc-pfcpiface:master-latest
+    zmqiface: docker.io/omecproject/upf-epc-cpiface:master-latest
   pullPolicy: Always
 
 nodeSelectors:
@@ -55,39 +56,33 @@
       enabled: true
     sriov:
       enabled: true
-    # Provide UPF interface driver.
-    # Available options are dpdk, af_xdp, af_packet.
-    mode: "dpdk"
-    name: "dp-name"
-    workers: 1
-    maxSessions: 50000
-    # Provide the S1U and SGI networks facing device name and IP address
+    # Dynamic IP allocation is not supported yet
+    ipam: static
+    cniPlugin: vfioveth
+    enb:
+      subnet: 192.168.251.0/24
     s1u:
-      device: s1u
-      subnet: 192.168.252.0/24
       gateway: 192.168.252.1
       ip: 192.168.252.3/24
     sgi:
-      device: sgi
-      subnet: 192.168.250.0/24
       gateway: 192.168.250.1
       ip: 192.168.250.3/24
-    enb:
-      subnet: 192.168.251.0/24
-    ue:
-      subnet: 10.250.0.0/16
-    zmq:
-      recvPort: 20
-      spgwc:
-        addr: spgwc-headless
-        port: 21
+    cfgFiles:
+      upf.json:
+        mode: dpdk
+        workers: 1
+        max_sessions: 50000
+        cpiface:
+          nb_dst_ip: spgwc-headless
+          hostname: upf-bess
+        s1u:
+          ifname: s1u
+        sgi:
+          ifname: sgi
+        measure: true
     bess:
       web:
         nodePort: 36000
-    # Dynamic IP allocation is not supported for the user plane interfaces
-    ipam: static
-    cniPlugin: vfioveth
-    hugepage:
-      enabled: true
-    sriov:
-      enabled: true
+    cpiface:
+      # pfcp or zmq
+      mode: pfcp