diff --git a/5g-ran-sim/templates/bin/_gnbsim-run.sh.tpl b/5g-ran-sim/templates/bin/_gnbsim-run.sh.tpl
index bc5db92..e262373 100644
--- a/5g-ran-sim/templates/bin/_gnbsim-run.sh.tpl
+++ b/5g-ran-sim/templates/bin/_gnbsim-run.sh.tpl
@@ -16,10 +16,8 @@
 
 {{- if not .Values.config.gnbsim.singleInterface }}
 {{- range .Values.config.gnbsim.networkTopo }}
-ip route add {{ .upfAddr }} via {{ .upfGw }}
+ip route replace {{ .upfAddr }} via {{ .upfGw }}
+{{- end }}
 {{- end }}
 
-# Disabling checksum offloading to hardware
-ethtool -K enb tx off
-{{- end }}
 sleep infinity
diff --git a/5g-ran-sim/templates/networks.yaml b/5g-ran-sim/templates/networks.yaml
index e75920e..90f9d20 100644
--- a/5g-ran-sim/templates/networks.yaml
+++ b/5g-ran-sim/templates/networks.yaml
@@ -8,10 +8,10 @@
 apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
-  name: enb-net
+  name: gnb-net
 {{- if $.Values.config.gnbsim.sriov.enabled }}
   annotations:
-    k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_access_net
+    k8s.v1.cni.cncf.io/resourceName:  {{ .Values.config.gnbsim.sriov.resourceName }}
 {{- end }}
 spec:
   config: '{
@@ -19,6 +19,12 @@
     "cniVersion": "0.3.1",
 {{- end }}
     "type": {{ .Values.config.gnbsim.cniPlugin | quote }},
+  {{- if eq .Values.config.gnbsim.cniPlugin "macvlan" }}
+    "master": {{ .Values.config.gnbsim.iface | quote }},
+  {{- end }}
+  {{- if eq .Values.config.gnbsim.cniPlugin "host-device" }}
+    "device": {{ .Values.config.gnbsim.iface | quote }},
+  {{- end }}
     "ipam": {
         "type": {{ .Values.config.gnbsim.ipam | quote }}
     }
diff --git a/5g-ran-sim/templates/statefulset-gnbsim.yaml b/5g-ran-sim/templates/statefulset-gnbsim.yaml
index 88a0146..090e66e 100644
--- a/5g-ran-sim/templates/statefulset-gnbsim.yaml
+++ b/5g-ran-sim/templates/statefulset-gnbsim.yaml
@@ -27,8 +27,8 @@
       annotations:
         k8s.v1.cni.cncf.io/networks: '[
            { 
-               "name": "enb-net",
-               "interface": "enb",
+               "name": "gnb-net",
+               "interface": "gnb",
 {{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
                "ips": [{{ .Values.config.gnbsim.gnb.ip | quote }}]
 {{- else }}