diff --git a/omec/omec-user-plane/templates/statefulset-upf.yaml b/omec/omec-user-plane/templates/statefulset-upf.yaml
index 9285cd7..3ac3239 100644
--- a/omec/omec-user-plane/templates/statefulset-upf.yaml
+++ b/omec/omec-user-plane/templates/statefulset-upf.yaml
@@ -29,20 +29,18 @@
           {
             "name": "access-net",
             "interface": {{ index $accessConfig "ifname" | quote }},
-{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
+          {{- if hasKey .Values.config.upf.access "mac" }}
+            "mac": {{ .Values.config.upf.access.mac | quote }},
+          {{- end }}
             "ips": [{{ .Values.config.upf.access.ip | quote }}]
-{{- else }}
-            "ips": {{ .Values.config.upf.access.ip | quote }}
-{{- end }}
           },
           {
             "name": "core-net",
             "interface": {{ index $coreConfig "ifname" | quote }},
-{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
+          {{- if hasKey .Values.config.upf.core "mac" }}
+            "mac": {{ .Values.config.upf.core.mac | quote }},
+          {{- end }}
             "ips": [{{ .Values.config.upf.core.ip | quote }}]
-{{- else }}
-            "ips": {{ .Values.config.upf.core.ip | quote }}
-{{- end }}
           }
         ]'
     spec: