diff --git a/omec/omec-data-plane-cni/.helmignore b/omec/omec-data-plane-cni/.helmignore
index f0c1319..549c154 100644
--- a/omec/omec-data-plane-cni/.helmignore
+++ b/omec/omec-data-plane-cni/.helmignore
@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: 2020 Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 # Patterns to ignore when building packages.
 # This supports shell glob matching, relative path matching, and
 # negation (prefixed with !). Only one pattern per line.
diff --git a/omec/omec-data-plane-cni/Chart.yaml b/omec/omec-data-plane-cni/Chart.yaml
index be46241..4bd5c71 100644
--- a/omec/omec-data-plane-cni/Chart.yaml
+++ b/omec/omec-data-plane-cni/Chart.yaml
@@ -1,17 +1,9 @@
 ---
+
 # Copyright 2019-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 apiVersion: v1
 description: CNI setup for OMEC data plane
diff --git a/omec/omec-data-plane-cni/templates/_helpers.tpl b/omec/omec-data-plane-cni/templates/_helpers.tpl
index 451f9c0..0bb03ef 100644
--- a/omec/omec-data-plane-cni/templates/_helpers.tpl
+++ b/omec/omec-data-plane-cni/templates/_helpers.tpl
@@ -1,17 +1,10 @@
 {{- /*
+
 # Copyright 2019-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 {{/*
diff --git a/omec/omec-data-plane-cni/templates/configmap-sriov-conf.yaml b/omec/omec-data-plane-cni/templates/configmap-sriov-conf.yaml
index 2099c34..8cf4238 100644
--- a/omec/omec-data-plane-cni/templates/configmap-sriov-conf.yaml
+++ b/omec/omec-data-plane-cni/templates/configmap-sriov-conf.yaml
@@ -1,18 +1,9 @@
 {{/*
-Copyright 2018-present Open Networking Foundation
-Copyright 2018 Intel Corporation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018 Intel Corporation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 ---
diff --git a/omec/omec-data-plane-cni/templates/daemonset-sriov-plugin.yaml b/omec/omec-data-plane-cni/templates/daemonset-sriov-plugin.yaml
index 4bafb4f..d447330 100644
--- a/omec/omec-data-plane-cni/templates/daemonset-sriov-plugin.yaml
+++ b/omec/omec-data-plane-cni/templates/daemonset-sriov-plugin.yaml
@@ -1,18 +1,9 @@
 {{/*
-Copyright 2018-present Open Networking Foundation
-Copyright 2018 Intel Corporation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018 Intel Corporation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 ---
diff --git a/omec/omec-data-plane-cni/values.yaml b/omec/omec-data-plane-cni/values.yaml
index a7346e5..ee7fb82 100644
--- a/omec/omec-data-plane-cni/values.yaml
+++ b/omec/omec-data-plane-cni/values.yaml
@@ -1,16 +1,7 @@
 # Copyright 2019-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 images:
   tags: