diff --git a/charts/oai-5g-core/oai-5g-advance/values.yaml b/charts/oai-5g-core/oai-5g-advance/values.yaml
index 8f151c99e784960c98028866ca0405ec061de05c..0f69bf2db41ea704135d309858495b48b9ed0fa3 100644
--- a/charts/oai-5g-core/oai-5g-advance/values.yaml
+++ b/charts/oai-5g-core/oai-5g-advance/values.yaml
@@ -207,7 +207,11 @@ oai-traffic-server:
     create: @MULTUS_TS@
     ipAdd: "@IP_TS@"
     netmask: "@NETMASK_TS@"
+    ## If you do not need a specific mac address leave the field empty
+    mac: "@MAC_TS@"
     defaultGateway: "@GW_TS@"
+    ## If you do not want to add any routes in your pod then leave this field empty
+    routes: @ROUTES_TS@
     hostInterface: "@IF_NAME_TS@"  # Interface of the host machine on which this pod will be scheduled
   config:
     ueroute: 12.1.1.0/24
diff --git a/charts/oai-5g-core/oai-5g-basic/values.yaml b/charts/oai-5g-core/oai-5g-basic/values.yaml
index b94c1585b7c83a3c330f32afeb5ae198a68abce7..d696823b8077146c35491673d976d0a5e3d65ff7 100644
--- a/charts/oai-5g-core/oai-5g-basic/values.yaml
+++ b/charts/oai-5g-core/oai-5g-basic/values.yaml
@@ -230,7 +230,11 @@ oai-traffic-server:
     create: @MULTUS_TS@
     ipAdd: "@IP_TS@"
     netmask: "@NETMASK_TS@"
+    ## If you do not need a specific mac address leave the field empty
+    mac: "@MAC_TS@"
     defaultGateway: "@GW_TS@"
+    ## If you do not want to add any routes in your pod then leave this field empty
+    routes: @ROUTES_TS@
     hostInterface: "@IF_NAME_TS@"  # Interface of the host machine on which this pod will be scheduled
   config:
     ueroute: 12.1.1.0/24
diff --git a/charts/oai-5g-core/oai-traffic-server/templates/deployment.yaml b/charts/oai-5g-core/oai-traffic-server/templates/deployment.yaml
index 6f3797470c69ef2b8ccafed4765ff1a6b2e65270..1beb0f3f845a5c8ad54baceb42ca83f9b43ca802 100644
--- a/charts/oai-5g-core/oai-traffic-server/templates/deployment.yaml
+++ b/charts/oai-5g-core/oai-traffic-server/templates/deployment.yaml
@@ -22,8 +22,13 @@ spec:
       annotations:
         k8s.v1.cni.cncf.io/networks: >-
               [{
-                   "name": "{{ .Chart.Name }}-net1",
-                   "default-route": ["{{ .Values.multus.defaultGateway }}"]
+                   "name": "{{ .Chart.Name }}-net1"
+                   {{- if .Values.multus.mac }}
+                    ,"mac":  "{{ .Values.multus.mac }}"
+                   {{- end }}
+                   {{- if .Values.multus.defaultGateway }}
+                   ,"default-route": ["{{ .Values.multus.defaultGateway }}"]
+                   {{- end }}
               }]
       {{- end }}
     spec:
diff --git a/charts/oai-5g-core/oai-traffic-server/templates/multus.yaml b/charts/oai-5g-core/oai-traffic-server/templates/multus.yaml
index 004ffaf349b95022e5c7432cb15906d7d99a0cc7..79550d3f0d38128211cad263a4375d0f94f4d728 100644
--- a/charts/oai-5g-core/oai-traffic-server/templates/multus.yaml
+++ b/charts/oai-5g-core/oai-traffic-server/templates/multus.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ .Chart.Name }}-net1
 spec:
   config: '{
-      "cniVersion": "0.3.0",
+      "cniVersion": "0.3.1",
       "type": "macvlan",
       "master": {{- cat .Values.multus.hostInterface | nospace | quote }},
       "mode": "bridge",
diff --git a/charts/oai-5g-core/oai-traffic-server/values.yaml b/charts/oai-5g-core/oai-traffic-server/values.yaml
index 5b85180cc580c228db41a0dd8427187c1442f3a4..4bdd9b9a8e58558362a6d34b5d22556e07024a51 100644
--- a/charts/oai-5g-core/oai-traffic-server/values.yaml
+++ b/charts/oai-5g-core/oai-traffic-server/values.yaml
@@ -25,7 +25,11 @@ multus:
   create: false
   ipAdd: "172.21.6.99"
   netmask: "22"
-  defaultGateway: "172.21.7.254"
+  ## If you do not need a specific mac address leave the field empty
+  mac:
+  defaultGateway: ""
+  ## If you do not want to add any routes in your pod then leave this field empty
+  routes: ""
   hostInterface: "bond0"      # Interface of the host machine on which this pod will be scheduled
 
 config: