diff --git a/omec-control-plane/.gitignore b/omec-control-plane/.gitignore
index 894f7fe..616ae1a 100644
--- a/omec-control-plane/.gitignore
+++ b/omec-control-plane/.gitignore
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 charts/
diff --git a/omec-control-plane/.helmignore b/omec-control-plane/.helmignore
index 0d5155a..931186d 100644
--- a/omec-control-plane/.helmignore
+++ b/omec-control-plane/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 # Patterns to ignore when building packages.
 # This supports shell glob matching, relative path matching, and
diff --git a/omec-control-plane/Chart.yaml b/omec-control-plane/Chart.yaml
index ec6fae5..7bb0320 100644
--- a/omec-control-plane/Chart.yaml
+++ b/omec-control-plane/Chart.yaml
@@ -3,11 +3,10 @@
 # Copyright 2018-present Open Networking Foundation
 #
 # SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
 apiVersion: v1
 description: OMEC control plane services
 name: omec-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.9.18
+version: 0.9.19
diff --git a/omec-control-plane/requirements.yaml b/omec-control-plane/requirements.yaml
index 49146fd..8489a8f 100644
--- a/omec-control-plane/requirements.yaml
+++ b/omec-control-plane/requirements.yaml
@@ -1,6 +1,6 @@
 # Copyright 2019-present Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 dependencies:
   - name: cassandra
diff --git a/omec-control-plane/templates/NOTES.txt b/omec-control-plane/templates/NOTES.txt
index 78c519b..7398da0 100644
--- a/omec-control-plane/templates/NOTES.txt
+++ b/omec-control-plane/templates/NOTES.txt
@@ -4,7 +4,6 @@
 # Copyright 2018-present Open Networking Foundation
 #
 # SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
 */ -}}
 
diff --git a/omec-control-plane/templates/_helpers.tpl b/omec-control-plane/templates/_helpers.tpl
index be7fc5f..f259272 100644
--- a/omec-control-plane/templates/_helpers.tpl
+++ b/omec-control-plane/templates/_helpers.tpl
@@ -4,7 +4,6 @@
 # Copyright 2018-present Open Networking Foundation
 #
 # SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
 */ -}}
 
diff --git a/omec-control-plane/templates/bin/_config4g-run.sh.tpl b/omec-control-plane/templates/bin/_config4g-run.sh.tpl
index b568195..8fb7686 100644
--- a/omec-control-plane/templates/bin/_config4g-run.sh.tpl
+++ b/omec-control-plane/templates/bin/_config4g-run.sh.tpl
@@ -2,7 +2,7 @@
 
 # Copyright 2020-present Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 set -xe
 
diff --git a/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl b/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
index b6d8fda..6b0ea2e 100644
--- a/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
+++ b/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
@@ -4,7 +4,6 @@
 # Copyright 2019-present Open Networking Foundation
 #
 # SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
 set -ex
 
diff --git a/omec-control-plane/templates/bin/_hss-run.sh.tpl b/omec-control-plane/templates/bin/_hss-run.sh.tpl
index 6f2d8e9..6b3a5f9 100644
--- a/omec-control-plane/templates/bin/_hss-run.sh.tpl
+++ b/omec-control-plane/templates/bin/_hss-run.sh.tpl
@@ -2,7 +2,7 @@
 
 # Copyright 2019-present Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 
diff --git a/omec-control-plane/templates/bin/_mme-init.sh.tpl b/omec-control-plane/templates/bin/_mme-init.sh.tpl
index 256da0d..86a8553 100644
--- a/omec-control-plane/templates/bin/_mme-init.sh.tpl
+++ b/omec-control-plane/templates/bin/_mme-init.sh.tpl
@@ -2,7 +2,7 @@
 
 # Copyright 2019-present Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 
diff --git a/omec-control-plane/templates/bin/_mme-run.sh.tpl b/omec-control-plane/templates/bin/_mme-run.sh.tpl
index 1712a77..e09d672 100644
--- a/omec-control-plane/templates/bin/_mme-run.sh.tpl
+++ b/omec-control-plane/templates/bin/_mme-run.sh.tpl
@@ -2,7 +2,7 @@
 
 # Copyright 2019-present Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 APPLICATION=$1
 
diff --git a/omec-control-plane/templates/bin/_pcrf-bootstrap.sh.tpl b/omec-control-plane/templates/bin/_pcrf-bootstrap.sh.tpl
index 4afc210..fe00c56 100644
--- a/omec-control-plane/templates/bin/_pcrf-bootstrap.sh.tpl
+++ b/omec-control-plane/templates/bin/_pcrf-bootstrap.sh.tpl
@@ -3,7 +3,6 @@
 # Copyright 2020-present Open Networking Foundation
 #
 # SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
 set -ex
 
diff --git a/omec-control-plane/templates/bin/_pcrf-run.sh.tpl b/omec-control-plane/templates/bin/_pcrf-run.sh.tpl
index 7be50a6..f450ff8 100644
--- a/omec-control-plane/templates/bin/_pcrf-run.sh.tpl
+++ b/omec-control-plane/templates/bin/_pcrf-run.sh.tpl
@@ -2,7 +2,7 @@
 
 # Copyright 2020-present Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 set -ex
 
diff --git a/omec-control-plane/templates/bin/_spgwc-init.sh.tpl b/omec-control-plane/templates/bin/_spgwc-init.sh.tpl
index 82ca533..9d23f72 100644
--- a/omec-control-plane/templates/bin/_spgwc-init.sh.tpl
+++ b/omec-control-plane/templates/bin/_spgwc-init.sh.tpl
@@ -2,7 +2,7 @@
 
 # Copyright 2021-present Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 while ! curl -f --connect-timeout 5 http://spgwc:8080/startup
 do
diff --git a/omec-control-plane/templates/bin/_spgwc-run.sh.tpl b/omec-control-plane/templates/bin/_spgwc-run.sh.tpl
index fd1096d..e06cbde 100644
--- a/omec-control-plane/templates/bin/_spgwc-run.sh.tpl
+++ b/omec-control-plane/templates/bin/_spgwc-run.sh.tpl
@@ -2,7 +2,7 @@
 
 # Copyright 2019-present Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 APPLICATION=$1
 set -xe
diff --git a/omec-control-plane/templates/configmap-config4g.yaml b/omec-control-plane/templates/configmap-config4g.yaml
index 7a0b722..04c70a3 100644
--- a/omec-control-plane/templates/configmap-config4g.yaml
+++ b/omec-control-plane/templates/configmap-config4g.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2020-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 */}}
 
 {{- if .Values.config.config4g.deploy }}
diff --git a/omec-control-plane/templates/configmap-hss.yaml b/omec-control-plane/templates/configmap-hss.yaml
index 029a8b6..b301fba 100644
--- a/omec-control-plane/templates/configmap-hss.yaml
+++ b/omec-control-plane/templates/configmap-hss.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2019-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 Default values for mcord-vepc-helm.
 This is a YAML-formatted file.
diff --git a/omec-control-plane/templates/configmap-mme.yaml b/omec-control-plane/templates/configmap-mme.yaml
index f45f6ed..b9bb3a0 100644
--- a/omec-control-plane/templates/configmap-mme.yaml
+++ b/omec-control-plane/templates/configmap-mme.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2019-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 */}}
 
 {{- if .Values.config.mme.deploy }}
diff --git a/omec-control-plane/templates/configmap-pcrf.yaml b/omec-control-plane/templates/configmap-pcrf.yaml
index d5ad7cc..5c7e0ca 100644
--- a/omec-control-plane/templates/configmap-pcrf.yaml
+++ b/omec-control-plane/templates/configmap-pcrf.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2020-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 Default values for mcord-vepc-helm.
 This is a YAML-formatted file.
diff --git a/omec-control-plane/templates/configmap-spgwc.yaml b/omec-control-plane/templates/configmap-spgwc.yaml
index 6616998..124fb07 100644
--- a/omec-control-plane/templates/configmap-spgwc.yaml
+++ b/omec-control-plane/templates/configmap-spgwc.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2019-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 */}}
 
 {{- if .Values.config.spgwc.deploy }}
diff --git a/omec-control-plane/templates/service-config4g.yaml b/omec-control-plane/templates/service-config4g.yaml
index ab01c6c..8d426b4 100644
--- a/omec-control-plane/templates/service-config4g.yaml
+++ b/omec-control-plane/templates/service-config4g.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2020-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 */}}
 
 {{- if .Values.config.config4g.deploy }}
diff --git a/omec-control-plane/templates/service-hss.yaml b/omec-control-plane/templates/service-hss.yaml
index 371b363..7ed0145 100644
--- a/omec-control-plane/templates/service-hss.yaml
+++ b/omec-control-plane/templates/service-hss.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2019-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 */}}
 
 {{- if .Values.config.hss.deploy }}
diff --git a/omec-control-plane/templates/service-mme.yaml b/omec-control-plane/templates/service-mme.yaml
index 8ae95b9..b729ab2 100644
--- a/omec-control-plane/templates/service-mme.yaml
+++ b/omec-control-plane/templates/service-mme.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2019-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 */}}
 
 {{- if .Values.config.mme.deploy }}
diff --git a/omec-control-plane/templates/service-pcrf.yaml b/omec-control-plane/templates/service-pcrf.yaml
index 116f930..5058b19 100644
--- a/omec-control-plane/templates/service-pcrf.yaml
+++ b/omec-control-plane/templates/service-pcrf.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2020-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 */}}
 
 {{- if .Values.config.pcrf.deploy }}
diff --git a/omec-control-plane/templates/service-spgwc.yaml b/omec-control-plane/templates/service-spgwc.yaml
index c97689a..082a7bc 100644
--- a/omec-control-plane/templates/service-spgwc.yaml
+++ b/omec-control-plane/templates/service-spgwc.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2019-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 */}}
 
 {{- if .Values.config.spgwc.deploy }}
diff --git a/omec-control-plane/templates/statefulset-config4g.yaml b/omec-control-plane/templates/statefulset-config4g.yaml
index 2a20980..df3b8a7 100644
--- a/omec-control-plane/templates/statefulset-config4g.yaml
+++ b/omec-control-plane/templates/statefulset-config4g.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2020-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 */}}
 
 {{- if .Values.config.config4g.deploy }}
diff --git a/omec-control-plane/templates/statefulset-hss.yaml b/omec-control-plane/templates/statefulset-hss.yaml
index a69b4ac..1dc7e49 100644
--- a/omec-control-plane/templates/statefulset-hss.yaml
+++ b/omec-control-plane/templates/statefulset-hss.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2019-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 Default values for mcord-vepc-helm.
 This is a YAML-formatted file.
diff --git a/omec-control-plane/templates/statefulset-mme.yaml b/omec-control-plane/templates/statefulset-mme.yaml
index d690bb5..4c7744e 100644
--- a/omec-control-plane/templates/statefulset-mme.yaml
+++ b/omec-control-plane/templates/statefulset-mme.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2019-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 */}}
 
 {{- if .Values.config.mme.deploy }}
diff --git a/omec-control-plane/templates/statefulset-pcrf.yaml b/omec-control-plane/templates/statefulset-pcrf.yaml
index a7eb327..8fa34d8 100644
--- a/omec-control-plane/templates/statefulset-pcrf.yaml
+++ b/omec-control-plane/templates/statefulset-pcrf.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2020-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 Default values for mcord-vepc-helm.
 This is a YAML-formatted file.
diff --git a/omec-control-plane/templates/statefulset-spgwc.yaml b/omec-control-plane/templates/statefulset-spgwc.yaml
index 2262e65..953bafa 100644
--- a/omec-control-plane/templates/statefulset-spgwc.yaml
+++ b/omec-control-plane/templates/statefulset-spgwc.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright 2019-present Open Networking Foundation
 
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 */}}
 
 {{- if .Values.config.spgwc.deploy }}
diff --git a/omec-control-plane/values.yaml b/omec-control-plane/values.yaml
index 7ea695e..9b2d25e 100644
--- a/omec-control-plane/values.yaml
+++ b/omec-control-plane/values.yaml
@@ -2,7 +2,6 @@
 # Copyright 2018-present Open Networking Foundation
 #
 # SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
 images:
   tags: