diff --git a/.gitreview b/.gitreview
index e90697f..afa8278 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation <info@opennetworking.org>
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 [gerrit]
 host=gerrit.opencord.org
diff --git a/.reuse/dep5 b/.reuse/dep5
index 939b98f..6e71283 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -6,7 +6,7 @@
 
 Files: config-models/*/files/*.tree */files/configs/*.json */dashboards/*/*.json */files/opa-rbac/test/*.json go.mod go.sum
 Copyright: 2021 Open Networking Foundation
-License: LicenseRef-ONF-Member-Only-1.0
+License: Apache-2.0
 
 
 # per https://trustee.ietf.org/documents/trust-legal-provisions/copyright-policy-and-tlp-faq/
@@ -22,4 +22,4 @@
 # source: https://unsplash.com/ https://unsplash.com/license (also images are modified)
 Files: chronos-exporter/files/images/*.png
 Copyright: 2022 Open Networking Foundation
-License: LicenseRef-ONF-Member-Only-1.0
+License: Apache-2.0
diff --git a/LICENSES/LicenseRef-ONF-Member-Only-1.0.txt b/LICENSES/LicenseRef-ONF-Member-Only-1.0.txt
deleted file mode 100644
index bb813a1..0000000
--- a/LICENSES/LicenseRef-ONF-Member-Only-1.0.txt
+++ /dev/null
@@ -1,294 +0,0 @@
-ONF Member-Only Software License
-Version 1.0
-June 2020
-
-This ONF Member-Only Software License (this "License") is entered into by and
-between Open Networking Foundation ("ONF") and you and/or the entity on whose
-behalf you are accessing the Works (as defined in Section 1 below) ("you").
-This License forms a legally binding contract between you and ONF in relation
-to your access to and use of the Works. You may not access or use the Works if
-you do not accept this License.
-
-By accessing or using the Works, you hereby agree to the terms of this License.
-You may not use the Works and may not accept this License if you are a person
-barred from receiving the Works under the laws of the United States or other
-countries, including the country from which you access or use the Works. If you
-are agreeing to be bound by this License on behalf of your employer or other
-entity, you represent and warrant that you have full legal authority to bind
-your employer or such entity to this License. If you do not have the requisite
-authority, you may not accept this License or access or use the Works on behalf
-of your employer or any other entity.  You and ONF acknowledge and agree as
-follows:
-
-1. DEFINITIONS.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and
-configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object
-code, generated documentation, and conversions to other media types.
-
-"Works" shall mean the works of authorship, whether in Source or Object form,
-made available under this License, as indicated by a copyright notice/header
-file that is included in or attached to the Works.
-
-2. BACKGROUND.
-
-The purpose of this License is to provide ONF member companies in good standing
-("Members") with early access to software projects currently in development by
-ONF prior to their public release, to allow Members to review and test the
-Works internally for the purpose of making further contributions to the
-applicable project.  Members who are Partner-level Members at the time they
-first access the Works are additionally permitted under this License to use the
-Works internally for the purpose of building and developing products and
-services for commercial purposes as defined in Section 4.  However, this
-License does not permit any Member, regardless of Member level, to redistribute
-all or any portion of the Works, except as part of a contribution back to the
-applicable project, in accordance with Section 8 below, or in binary form as
-provided for Partner-level Members in Section 4 below.  You understand and
-agree that ONF has the sole right to sublicense and distribute a public version
-of the final code base for the applicable project to third parties under the
-2.0 version of the Apache License, or other permissive license terms selected
-by ONF in its sole discretion.
-
-The Purpose of this License is to incubate the development of new software
-projects by providing a framework for ONF Members to access and contribute to
-the projects while minimizing the potential for forking or misuse of the
-projects.  Nothing in this Background paragraph, however, shall require ONF to
-take any particular course of action regarding any Works covered by this
-License.
-
-3. LIMITED LICENSE TO ALL MEMBERS IN GOOD STANDING.
-
-Subject to your complete and ongoing compliance with all the terms and
-conditions set forth in this License, including without limitation all license
-limitations and restrictions set forth herein, ONF grants you the following
-limited, non-exclusive, non-transferable, non-sublicensable, revocable license
-to use, and (where applicable) authorize your employees and contractors
-performing work on your behalf (but only if such contractors are themselves
-Members of ONF and accept the terms of this License) to use the Works
-internally solely in connection with (a) reviewing, testing, modifying and
-creating derivatives of the Works for the sole purpose of making contributions
-by you to the code repository for the applicable project maintained by ONF; and
-(b) building, developing and testing your own applications or components that
-may interoperate with or incorporate the Works ("Applications") for the
-purposes of internal evaluation only.
-
-4. ADDITIONAL LICENSE TO PARTNER-LEVEL MEMBERS IN GOOD STANDING.
-
-Each project subject to this License shall be declared by ONF to be in one of
-two phases:  a) Incubation Phase, or b) Partner Commercialization Phase.  Each
-project shall start in the Incubation Phase, and ONF, at its sole discretion,
-shall determine when each project moves into the Partner Commercialization
-Phase.   Each project shall be documented to be in one of these two phases in
-the Project's README documentation and can be confirmed by contacting ONF.
-
-Once any project moves into the Partner Commercialization Phase, if you are a
-Partner-level ONF Member in good standing at the time you first access the
-Works and for the entire period during which you access and use the Works, in
-addition to the rights granted in Section 3, and subject to your complete and
-ongoing compliance with all the terms and conditions set forth in this License,
-including without limitation all license limitations and restrictions set forth
-herein, ONF grants you the limited, non-exclusive, non-transferable,
-non-sublicensable, revocable license to use, and (where applicable) authorize
-your employees and contractors performing work on your behalf (but only if such
-contractors are themselves Members of ONF and accept the terms of this License)
-to use, test, modify and create derivatives of the Works internally for the
-purpose of building, developing, testing, marketing, offering for sale and
-selling commercial products and services to third parties.  Wherever possible,
-you will take reasonable precautions to ensure Works remain accessible only to
-ONF Members, and any commercial product or service requiring redistribution of
-the Works, of modifications of the Works or of derivatives of the Works must be
-made solely in binary machine code form where possible to further this aim.
-
-Partners-level Members gaining additional insights as a result of accessing and
-using the Works for commercial products and services are expected to provide
-feedback to and to make contributions to the project for the benefit of both
-the project and the general membership.
-
-You may verify your company's Partner-level membership status on the ONF
-website at: https://www.opennetworking.org/member-listing/.
-
-4.1 GRACE PERIOD FOR NON-PARTNER-LEVEL MEMBERS
-
-If you are not a Partner-level Member and you wish to benefit from the rights
-granted to ONF Partners in Section 4, you have a 90-day grace period from the
-day you first access the Works to upgrade to a Partner-Level ONF Membership.
-Should you upgrade within this grace period, you will be recognized as if you
-had been a Partner on the day you first accessed the Works for the purpose of
-interpreting your rights under Section 4.
-
-5. RESTRICTIONS.
-
-By accessing or using the Works, you represent, warrant, and covenant that you
-and/or the entity on whose behalf you are accessing the Works is a Member in
-good standing of ONF.
-
-You acknowledge that, except for the limited rights expressly set forth above,
-the foregoing licenses do not include any right to, and you agree not to (i)
-redistribute, sell, lease, license, modify or otherwise create any derivative
-works of any portion of the Works, or (ii) distribute, deploy, or otherwise
-utilize the Works or Applications for any public, production, commercial, or
-other similar purpose other than internal use for evaluation and development of
-contributions to the code repository for the applicable project maintained by
-ONF and non-public, experimental Applications.
-
-Except as expressly provided herein, you may not (w) reproduce, distribute,
-publicly display, or publicly perform any part of the Works, (x) decompile,
-reverse engineer, or otherwise access or attempt to access source code not made
-available to you in source code form, (y) make or attempt to make any
-modification to, or otherwise create any derivative works of, the Works; or (z)
-remove, obscure, interfere with or circumvent any feature of the Works,
-including without limitation any copyright or other intellectual property
-notices, security, or access control mechanism. You agree that you will not use
-the Works to do anything illegal, including facilitating, promoting, or
-otherwise encouraging any illegal activities.
-
-You represent and warrant that the Works will not be shipped, transferred or
-exported into any country or used in any manner prohibited by the United States
-Export Administration Act or any other export laws, restrictions or regulations
-(collectively the "Export Laws"). In addition, if the Works are identified as
-an export controlled item under the Export Laws, you represent and warrant that
-you are not a citizen, or otherwise located within, an embargoed nation
-(including without limitation Crimea, Cuba, Iran, North Korea, Sudan, or Syria)
-and that you are not otherwise prohibited under the Export Laws from receiving
-the Works.
-
-ANY USE IN VIOLATION OF THE FOREGOING LIMITATIONS AND RESTRICTIONS IS STRICTLY
-PROHIBITED, AND UNLICENSED.
-
-6. RESERVATION OF RIGHTS.
-
-The Works are owned by ONF and/or its licensors, and are licensed, not sold, to
-you. The Works are protected by copyright, trade dress, patent, and trademark
-laws of the United States and other jurisdictions, international conventions,
-and all other relevant intellectual property and proprietary rights, and
-applicable laws (collectively, the "Intellectual Property Rights"). You agree
-that ONF or its subsidiaries or affiliated companies and/or its licensors own
-all legal right, title and interest in and to the Works, including any and all
-Intellectual Property Rights. ONF reserves all rights not expressly granted in
-this License. You do not acquire any right, title or interest to the Works,
-whether by implication, estoppel, or otherwise, except for the limited rights
-set forth in this License.
-
-You agree that the form and nature of the Works that ONF provides may change
-without prior notice to you and that future versions of the Works may be
-incompatible with applications developed using previous versions of the Works.
-You agree that ONF may stop (permanently or temporarily) providing the Works
-(or any features within the Works) to you or to users generally at ONF's sole
-discretion, without prior notice to you. Nothing in this License gives you a
-right to use any of ONF's trade names, trademarks, service marks, logos, domain
-names, or other distinctive brand features.
-
-7. PURPOSE AND USE.
-
-You agree that you will not engage in any activity with the Works, including
-the development or distribution of an Application that interferes with,
-disrupts, damages, or accesses in an unauthorized manner the servers, networks,
-or other properties or services of any third party. You agree that you are
-solely responsible for (and that ONF has no responsibility to you or to any
-third party for) any data, content, or resources that you create, transmit or
-display. You agree that you are solely responsible for (and that ONF has no
-responsibility to you or to any third party for) any breach of your obligations
-under this License, any applicable third party contract or terms of service, or
-any applicable law or regulation, and for the consequences (including any loss
-or damage which ONF or any third party may suffer) of any such breach.
-
-8. FEEDBACK; CONTRIBUTIONS.
-
-If you provide ONF with any comments, bug reports, feedback, enhancements, or
-modifications proposed or suggested by you for the Works ("Feedback"), such
-Feedback will be submitted as a Contribution to the applicable project
-maintained by ONF under the terms and conditions of a Contributor License
-Agreement between you and ONF, is provided on a non-confidential basis
-(notwithstanding any notice to the contrary you may include in any accompanying
-communication), and ONF shall have the right to use such Feedback at its
-discretion, including, but not limited to the incorporation of such Feedback
-into the Works and any final code base that may be derived from the Works.
-
-9. TERMINATION OF THIS LICENSE.
-
-This License will continue to apply until terminated by either you or ONF as
-set out below. If you want to terminate this License, you may do so by ceasing
-your use of the Works. If you cease being a Member in good standing of ONF,
-this License will terminate automatically and without further notice to you.
-ONF may at any time terminate this License: (a) if you have breached any
-provision of this License; or (b) at ONF's convenience.  When this License
-comes to an end, except as otherwise set forth in this paragraph 9, all of the
-legal rights, obligations and liabilities that you and ONF have benefited from,
-been subject to (or which have accrued over time while this License has been in
-force) or which are expressed to continue indefinitely, shall be unaffected by
-this cessation, and paragraphs 1, 2 and 5 through 14 shall continue to apply to
-such rights, obligations and liabilities indefinitely.  In addition, unless
-this License is terminated by ONF as a result of your breach of any provision
-of this License, Partner-level Members entitled to the benefits of Section 4 of
-this License shall also retain all rights granted by Section 4 so as long as
-you remain a Partner-level Member in good standing.
-
-10. DISCLAIMER OF WARRANTIES.
-
-YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE WORKS IS AT YOUR SOLE
-RISK AND THAT THE WORKS ARE PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT
-WARRANTY OF ANY KIND FROM ONF. YOUR USE OF THE WORKS IS AT YOUR OWN DISCRETION
-AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM
-OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. ONF FURTHER
-EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ONF
-EXPRESSLY DISCLAIMS ANY WARRANTIES OF ANY KIND WITH RESPECT TO THE ACCURACY OR
-FUNCTIONALITY OF THE WORKS, AND WITH RESPECT TO THE ACCURACY, VALIDITY, OR
-COMPLETENESS OF ANY INFORMATION OR FEATURES AVAILABLE THROUGH THE WORKS, OR THE
-QUALITY OR CONSISTENCY OF THE WORKS OR RESULTS OBTAINED THROUGH THEIR USE.
-
-11. LIMITATION OF LIABILITY.
-
-YOU EXPRESSLY UNDERSTAND AND AGREE THAT ONF, ITS SUBSIDIARIES AND AFFILIATES,
-AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES
-THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT ONF OR
-ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE
-POSSIBILITY OF ANY SUCH LOSSES. IN NO EVENT WILL ONF'S AGGREGATE LIABILITY FOR
-DAMAGES ARISING OUT OF THIS LICENSE OR YOUR USE OF THE WORKS EXCEED THE GREATER
-OF AMOUNTS PAID BY YOU FOR THE WORKS, IF ANY.
-
-12. INDEMNIFICATION.
-
-To the maximum extent permitted by law, you agree to defend, indemnify and hold
-harmless ONF, its affiliates and their respective directors, officers,
-employees and agents from and against any and all claims, actions, suits or
-proceedings, as well as any and all losses, liabilities, damages, costs and
-expenses (including reasonable attorneys' fees) arising out of or accruing from
-(a) your use of the Works, (b) any Application or (for Partner-level Members)
-commercial product or service you develop using the Works that infringes any
-copyright, trademark, trade secret, trade dress, patent or other intellectual
-property right of any person, and (c) any non-compliance by you with this
-License or any applicable law or regulation.
-
-13. CHANGES TO THIS LICENSE.
-
-ONF may make changes to this License as it distributes new versions of the
-Works. When these changes are made, ONF will make a new version of this License
-available on the ONF website.
-
-14. MISCELLANEOUS TERMS.
-
-This License constitutes the entire legal agreement between you and ONF with
-regard to your access and use of the Works, and governs your access and use of
-the Works and completely supersedes any prior agreements between you and ONF in
-relation to the Works, except for any Contributor License Agreement you may
-have executed with ONF. You agree that if ONF does not exercise or enforce any
-legal right or remedy which is contained in this License (or which ONF has the
-benefit of under any applicable law), this will not be taken to be a formal
-waiver of ONF's rights and that those rights or remedies will still be
-available to ONF. If any court of law, having the jurisdiction to decide on
-this matter, rules that any provision of this License is invalid, then that
-provision will be removed from this License without affecting the rest of this
-License. The remaining provisions of this License will continue to be valid and
-enforceable so long as this License, as so modified, does not substantially
-impair the respective expectations or reciprocal obligations of the parties.
-The rights granted in this License may not be assigned or transferred by you
-without the prior written approval of ONF. You shall not be permitted to
-delegate your responsibilities or obligations under this License without the
-prior written approval of ONF.
diff --git a/Makefile b/Makefile
index cba26bc..6d9f127 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 .PHONY: all test clean
 
diff --git a/aether-enterprise-portal/.helmignore b/aether-enterprise-portal/.helmignore
index f7a328e..b31d38d 100644
--- a/aether-enterprise-portal/.helmignore
+++ b/aether-enterprise-portal/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/aether-enterprise-portal/Chart.yaml b/aether-enterprise-portal/Chart.yaml
index b65549c..9e366f9 100644
--- a/aether-enterprise-portal/Chart.yaml
+++ b/aether-enterprise-portal/Chart.yaml
@@ -1,13 +1,13 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: aether-enterprise-portal
 description: Aether Enterprise Portal
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.0.6
+version: 0.0.7
 appVersion: 0.0.6
 keywords:
   - aether
diff --git a/aether-enterprise-portal/README.md b/aether-enterprise-portal/README.md
index 6e6f2c0..fde937d 100644
--- a/aether-enterprise-portal/README.md
+++ b/aether-enterprise-portal/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## Aether Enterprise Portal Helm Chart
diff --git a/aether-enterprise-portal/files/certs/README.md b/aether-enterprise-portal/files/certs/README.md
index 7e6e434..26be54f 100644
--- a/aether-enterprise-portal/files/certs/README.md
+++ b/aether-enterprise-portal/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/aether-enterprise-portal/templates/NOTES.txt b/aether-enterprise-portal/templates/NOTES.txt
index 7e54b13..052354d 100644
--- a/aether-enterprise-portal/templates/NOTES.txt
+++ b/aether-enterprise-portal/templates/NOTES.txt
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 Thank you for installing {{ .Chart.Name }} Helm chart.
 
diff --git a/aether-enterprise-portal/templates/_helpers.tpl b/aether-enterprise-portal/templates/_helpers.tpl
index e786b78..351be61 100644
--- a/aether-enterprise-portal/templates/_helpers.tpl
+++ b/aether-enterprise-portal/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 
 Expand the name of the chart.
 */}}
diff --git a/aether-enterprise-portal/templates/configmap.yaml b/aether-enterprise-portal/templates/configmap.yaml
index a16976c..bed5fab 100644
--- a/aether-enterprise-portal/templates/configmap.yaml
+++ b/aether-enterprise-portal/templates/configmap.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/aether-enterprise-portal/templates/deployment.yaml b/aether-enterprise-portal/templates/deployment.yaml
index 792d148..36c0d5b 100644
--- a/aether-enterprise-portal/templates/deployment.yaml
+++ b/aether-enterprise-portal/templates/deployment.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/aether-enterprise-portal/templates/ingress.yaml b/aether-enterprise-portal/templates/ingress.yaml
index bb28795..57e9316 100644
--- a/aether-enterprise-portal/templates/ingress.yaml
+++ b/aether-enterprise-portal/templates/ingress.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 {{- if .Values.ingress.enabled }}
 apiVersion: networking.k8s.io/v1
diff --git a/aether-enterprise-portal/templates/role.yaml b/aether-enterprise-portal/templates/role.yaml
index 779e746..aa7bbf1 100644
--- a/aether-enterprise-portal/templates/role.yaml
+++ b/aether-enterprise-portal/templates/role.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/aether-enterprise-portal/templates/rolebinding.yaml b/aether-enterprise-portal/templates/rolebinding.yaml
index 06e971f..a8ddebd 100644
--- a/aether-enterprise-portal/templates/rolebinding.yaml
+++ b/aether-enterprise-portal/templates/rolebinding.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
diff --git a/aether-enterprise-portal/templates/secret.yaml b/aether-enterprise-portal/templates/secret.yaml
index 071304f..e55ef2e 100644
--- a/aether-enterprise-portal/templates/secret.yaml
+++ b/aether-enterprise-portal/templates/secret.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: Secret
diff --git a/aether-enterprise-portal/templates/service.yaml b/aether-enterprise-portal/templates/service.yaml
index 132efda..8d2f942 100644
--- a/aether-enterprise-portal/templates/service.yaml
+++ b/aether-enterprise-portal/templates/service.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: Service
diff --git a/aether-enterprise-portal/values.yaml b/aether-enterprise-portal/values.yaml
index da71552..429b903 100644
--- a/aether-enterprise-portal/values.yaml
+++ b/aether-enterprise-portal/values.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 # Default values for aether-enterprise-portal.
 # This is a YAML-formatted file.
diff --git a/aether-roc-api/.helmignore b/aether-roc-api/.helmignore
index f7a328e..b31d38d 100644
--- a/aether-roc-api/.helmignore
+++ b/aether-roc-api/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/aether-roc-api/Chart.yaml b/aether-roc-api/Chart.yaml
index 2969bf2..b5f3afb 100644
--- a/aether-roc-api/Chart.yaml
+++ b/aether-roc-api/Chart.yaml
@@ -1,13 +1,13 @@
 # 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
 
 apiVersion: v2
 name: aether-roc-api
 description: Aether ROC API
 kubeVersion: ">=1.15.0"
 type: application
-version: 1.4.4
+version: 1.4.5
 appVersion: v0.9.5
 keywords:
   - aether
diff --git a/aether-roc-api/README.md b/aether-roc-api/README.md
index c0b24a6..bbb6a0d 100644
--- a/aether-roc-api/README.md
+++ b/aether-roc-api/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## Aether ROC API
diff --git a/aether-roc-api/files/certs/README.md b/aether-roc-api/files/certs/README.md
index e33ad8d..c03285b 100644
--- a/aether-roc-api/files/certs/README.md
+++ b/aether-roc-api/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/aether-roc-api/templates/NOTES.txt b/aether-roc-api/templates/NOTES.txt
index 4e34ee7..5473199 100644
--- a/aether-roc-api/templates/NOTES.txt
+++ b/aether-roc-api/templates/NOTES.txt
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 Thank you for installing {{ .Chart.Name }} Helm chart.
 
diff --git a/aether-roc-api/templates/_helpers.tpl b/aether-roc-api/templates/_helpers.tpl
index a7db7ce..ce484d0 100644
--- a/aether-roc-api/templates/_helpers.tpl
+++ b/aether-roc-api/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/aether-roc-api/templates/configmap.yaml b/aether-roc-api/templates/configmap.yaml
index 20047ea..0af4ddc 100644
--- a/aether-roc-api/templates/configmap.yaml
+++ b/aether-roc-api/templates/configmap.yaml
@@ -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
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/aether-roc-api/templates/deployment.yaml b/aether-roc-api/templates/deployment.yaml
index cd31a8c..cbe2c43 100644
--- a/aether-roc-api/templates/deployment.yaml
+++ b/aether-roc-api/templates/deployment.yaml
@@ -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
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/aether-roc-api/templates/secret.yaml b/aether-roc-api/templates/secret.yaml
index 04e9c5d..96cbd49 100644
--- a/aether-roc-api/templates/secret.yaml
+++ b/aether-roc-api/templates/secret.yaml
@@ -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
 
 apiVersion: v1
 kind: Secret
diff --git a/aether-roc-api/templates/service.yaml b/aether-roc-api/templates/service.yaml
index 9c82225..2dc747d 100644
--- a/aether-roc-api/templates/service.yaml
+++ b/aether-roc-api/templates/service.yaml
@@ -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
 
 apiVersion: v1
 kind: Service
diff --git a/aether-roc-api/templates/serviceaccount.yaml b/aether-roc-api/templates/serviceaccount.yaml
index 6d0ba2a..5fec053 100644
--- a/aether-roc-api/templates/serviceaccount.yaml
+++ b/aether-roc-api/templates/serviceaccount.yaml
@@ -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
 
 ---
 apiVersion: v1
diff --git a/aether-roc-api/values.yaml b/aether-roc-api/values.yaml
index 2151d06..5f1a289 100644
--- a/aether-roc-api/values.yaml
+++ b/aether-roc-api/values.yaml
@@ -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
 
 # Default values for aether-roc-api.
 # This is a YAML-formatted file.
diff --git a/aether-roc-gui-v2/.helmignore b/aether-roc-gui-v2/.helmignore
index f7a328e..b31d38d 100644
--- a/aether-roc-gui-v2/.helmignore
+++ b/aether-roc-gui-v2/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/aether-roc-gui-v2/Chart.yaml b/aether-roc-gui-v2/Chart.yaml
index f12a995..524c07d 100644
--- a/aether-roc-gui-v2/Chart.yaml
+++ b/aether-roc-gui-v2/Chart.yaml
@@ -1,13 +1,13 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: aether-roc-gui-v2
 description: Aether ROC Graphical User Interface
 kubeVersion: ">=1.15.0"
 type: application
-version: 2.0.0
+version: 2.0.1
 appVersion: 2.0.0
 keywords:
   - aether
diff --git a/aether-roc-gui-v2/README.md b/aether-roc-gui-v2/README.md
index 34d463c..d903671 100644
--- a/aether-roc-gui-v2/README.md
+++ b/aether-roc-gui-v2/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## Aether ROC GUI Helm Chart
diff --git a/aether-roc-gui-v2/files/certs/README.md b/aether-roc-gui-v2/files/certs/README.md
index 7e6e434..26be54f 100644
--- a/aether-roc-gui-v2/files/certs/README.md
+++ b/aether-roc-gui-v2/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/aether-roc-gui-v2/templates/NOTES.txt b/aether-roc-gui-v2/templates/NOTES.txt
index 316f504..1d17fa7 100644
--- a/aether-roc-gui-v2/templates/NOTES.txt
+++ b/aether-roc-gui-v2/templates/NOTES.txt
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 Thank you for installing {{ .Chart.Name }} Helm chart.
 
diff --git a/aether-roc-gui-v2/templates/_helpers.tpl b/aether-roc-gui-v2/templates/_helpers.tpl
index 8dd6a8c..3df9bfd 100644
--- a/aether-roc-gui-v2/templates/_helpers.tpl
+++ b/aether-roc-gui-v2/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/aether-roc-gui-v2/templates/configmap.yaml b/aether-roc-gui-v2/templates/configmap.yaml
index 0cf6ad2..c76e135 100644
--- a/aether-roc-gui-v2/templates/configmap.yaml
+++ b/aether-roc-gui-v2/templates/configmap.yaml
@@ -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
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/aether-roc-gui-v2/templates/deployment.yaml b/aether-roc-gui-v2/templates/deployment.yaml
index cbb2601..cf07343 100644
--- a/aether-roc-gui-v2/templates/deployment.yaml
+++ b/aether-roc-gui-v2/templates/deployment.yaml
@@ -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
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/aether-roc-gui-v2/templates/ingress.yaml b/aether-roc-gui-v2/templates/ingress.yaml
index 986342e..d3649f7 100644
--- a/aether-roc-gui-v2/templates/ingress.yaml
+++ b/aether-roc-gui-v2/templates/ingress.yaml
@@ -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
 
 {{- if .Values.ingress.enabled }}
 apiVersion: networking.k8s.io/v1
diff --git a/aether-roc-gui-v2/templates/role.yaml b/aether-roc-gui-v2/templates/role.yaml
index 1780115..f8521f4 100644
--- a/aether-roc-gui-v2/templates/role.yaml
+++ b/aether-roc-gui-v2/templates/role.yaml
@@ -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
 
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/aether-roc-gui-v2/templates/rolebinding.yaml b/aether-roc-gui-v2/templates/rolebinding.yaml
index 45b5ec1..85c190d 100644
--- a/aether-roc-gui-v2/templates/rolebinding.yaml
+++ b/aether-roc-gui-v2/templates/rolebinding.yaml
@@ -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
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
diff --git a/aether-roc-gui-v2/templates/secret.yaml b/aether-roc-gui-v2/templates/secret.yaml
index c047eed..0a88764 100644
--- a/aether-roc-gui-v2/templates/secret.yaml
+++ b/aether-roc-gui-v2/templates/secret.yaml
@@ -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
 
 apiVersion: v1
 kind: Secret
diff --git a/aether-roc-gui-v2/templates/service.yaml b/aether-roc-gui-v2/templates/service.yaml
index 6faf652..ae7bd31 100644
--- a/aether-roc-gui-v2/templates/service.yaml
+++ b/aether-roc-gui-v2/templates/service.yaml
@@ -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
 
 apiVersion: v1
 kind: Service
diff --git a/aether-roc-gui-v2/values.yaml b/aether-roc-gui-v2/values.yaml
index 90622db..243fc6d 100644
--- a/aether-roc-gui-v2/values.yaml
+++ b/aether-roc-gui-v2/values.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 # Default values for aether-roc-gui.
 # This is a YAML-formatted file.
diff --git a/aether-roc-gui-v4/.helmignore b/aether-roc-gui-v4/.helmignore
index f7a328e..b31d38d 100644
--- a/aether-roc-gui-v4/.helmignore
+++ b/aether-roc-gui-v4/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/aether-roc-gui-v4/Chart.yaml b/aether-roc-gui-v4/Chart.yaml
index f2ca4f7..4a3df49 100644
--- a/aether-roc-gui-v4/Chart.yaml
+++ b/aether-roc-gui-v4/Chart.yaml
@@ -1,13 +1,13 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: aether-roc-gui-v4
 description: Aether ROC Graphical User Interface
 kubeVersion: ">=1.15.0"
 type: application
-version: 4.0.15
+version: 4.0.16
 appVersion: 4.0.0
 keywords:
   - aether
diff --git a/aether-roc-gui-v4/README.md b/aether-roc-gui-v4/README.md
index 34d463c..d903671 100644
--- a/aether-roc-gui-v4/README.md
+++ b/aether-roc-gui-v4/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## Aether ROC GUI Helm Chart
diff --git a/aether-roc-gui-v4/files/certs/README.md b/aether-roc-gui-v4/files/certs/README.md
index 7e6e434..26be54f 100644
--- a/aether-roc-gui-v4/files/certs/README.md
+++ b/aether-roc-gui-v4/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/aether-roc-gui-v4/templates/NOTES.txt b/aether-roc-gui-v4/templates/NOTES.txt
index 316f504..1d17fa7 100644
--- a/aether-roc-gui-v4/templates/NOTES.txt
+++ b/aether-roc-gui-v4/templates/NOTES.txt
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 Thank you for installing {{ .Chart.Name }} Helm chart.
 
diff --git a/aether-roc-gui-v4/templates/_helpers.tpl b/aether-roc-gui-v4/templates/_helpers.tpl
index 8dd6a8c..3df9bfd 100644
--- a/aether-roc-gui-v4/templates/_helpers.tpl
+++ b/aether-roc-gui-v4/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/aether-roc-gui-v4/templates/configmap.yaml b/aether-roc-gui-v4/templates/configmap.yaml
index 0cf6ad2..c76e135 100644
--- a/aether-roc-gui-v4/templates/configmap.yaml
+++ b/aether-roc-gui-v4/templates/configmap.yaml
@@ -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
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/aether-roc-gui-v4/templates/deployment.yaml b/aether-roc-gui-v4/templates/deployment.yaml
index cbb2601..cf07343 100644
--- a/aether-roc-gui-v4/templates/deployment.yaml
+++ b/aether-roc-gui-v4/templates/deployment.yaml
@@ -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
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/aether-roc-gui-v4/templates/ingress.yaml b/aether-roc-gui-v4/templates/ingress.yaml
index 986342e..d3649f7 100644
--- a/aether-roc-gui-v4/templates/ingress.yaml
+++ b/aether-roc-gui-v4/templates/ingress.yaml
@@ -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
 
 {{- if .Values.ingress.enabled }}
 apiVersion: networking.k8s.io/v1
diff --git a/aether-roc-gui-v4/templates/role.yaml b/aether-roc-gui-v4/templates/role.yaml
index 1780115..f8521f4 100644
--- a/aether-roc-gui-v4/templates/role.yaml
+++ b/aether-roc-gui-v4/templates/role.yaml
@@ -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
 
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/aether-roc-gui-v4/templates/rolebinding.yaml b/aether-roc-gui-v4/templates/rolebinding.yaml
index 45b5ec1..85c190d 100644
--- a/aether-roc-gui-v4/templates/rolebinding.yaml
+++ b/aether-roc-gui-v4/templates/rolebinding.yaml
@@ -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
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
diff --git a/aether-roc-gui-v4/templates/secret.yaml b/aether-roc-gui-v4/templates/secret.yaml
index c047eed..0a88764 100644
--- a/aether-roc-gui-v4/templates/secret.yaml
+++ b/aether-roc-gui-v4/templates/secret.yaml
@@ -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
 
 apiVersion: v1
 kind: Secret
diff --git a/aether-roc-gui-v4/templates/service.yaml b/aether-roc-gui-v4/templates/service.yaml
index 6faf652..ae7bd31 100644
--- a/aether-roc-gui-v4/templates/service.yaml
+++ b/aether-roc-gui-v4/templates/service.yaml
@@ -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
 
 apiVersion: v1
 kind: Service
diff --git a/aether-roc-gui-v4/values.yaml b/aether-roc-gui-v4/values.yaml
index fad0b6e..7757f22 100644
--- a/aether-roc-gui-v4/values.yaml
+++ b/aether-roc-gui-v4/values.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 # Default values for aether-roc-gui.
 # This is a YAML-formatted file.
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 545cd90..4ea71be 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -1,13 +1,13 @@
 # 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
 
 apiVersion: v2
 name: aether-roc-umbrella
 description: Aether ROC Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 2.0.17
+version: 2.0.18
 appVersion: v0.0.0
 keywords:
   - aether
@@ -24,15 +24,15 @@
   - name: config-model-aether-2
     condition: onos-config.models.aether.v2.enabled
     repository: "file://../config-models/aether-2.0.x"
-    version: 2.0.7
+    version: 2.0.8
   - name: config-model-aether-4
     condition: onos-config.models.aether.v4.enabled
     repository: "file://../config-models/aether-4.x"
-    version: 4.0.17
+    version: 4.0.18
   - name: config-model-plproxy
     condition: onos-config.models.plproxy.v1.enabled
     repository: "file://../config-models/plproxy-1.x"
-    version: 1.0.1
+    version: 1.0.2
     alias: config-model-plproxy-1-0-0
   - name: onos-config
     condition: import.onos-config.enabled
@@ -49,31 +49,31 @@
   - name: aether-roc-api
     condition: import.aether-roc-api.enabled
     repository: "file://../aether-roc-api"
-    version: 1.4.4
+    version: 1.4.5
   - name: aether-roc-websocket
     condition: import.aether-roc-websocket.enabled
     repository: "file://../aether-roc-websocket"
-    version: 1.1.0
+    version: 1.1.1
   - name: aether-roc-gui-v4
     condition: import.aether-roc-gui.v4.enabled
     repository: "file://../aether-roc-gui-v4"
-    version: 4.0.15
+    version: 4.0.16
   - name: aether-roc-gui-v2
     condition: import.aether-roc-gui.v2.enabled
     repository: "file://../aether-roc-gui-v2"
-    version: 2.0.0
+    version: 2.0.1
   - name: sdcore-adapter-v2
     condition: import.sdcore-adapter.v2.enabled
     repository: "file://../sdcore-adapter-v2"
-    version: 2.0.2
+    version: 2.0.3
   - name: sdcore-adapter-v4
     condition: import.sdcore-adapter.v4.enabled
     repository: "file://../sdcore-adapter-v4"
-    version: 4.0.18
+    version: 4.0.19
   - name: subscriber-proxy
     condition: import.subscriber-proxy.enabled
     repository: "file://../subscriber-proxy"
-    version: 0.1.1
+    version: 0.1.2
   - name: nginx
     alias: sdcore-test-dummy
     condition: import.sdcore-test-dummy.enabled
@@ -101,14 +101,14 @@
   - name: prom-label-proxy
     condition: import.prom-label-proxy.amp.enabled
     repository: "file://../prom-label-proxy"
-    version: 0.1.1
+    version: 0.1.2
     alias: prom-label-proxy-amp
   - name: prom-label-proxy
     condition: import.prom-label-proxy.acc.enabled
     repository: "file://../prom-label-proxy"
-    version: 0.1.1
+    version: 0.1.2
     alias: prom-label-proxy-acc
   - name: demo-exporter
     condition: import.demo-exporter.enabled
     repository: "file://../demo-exporter"
-    version: 0.1.0
+    version: 0.1.1
diff --git a/aether-roc-umbrella/README.md b/aether-roc-umbrella/README.md
index 03a720b..19ef73f 100644
--- a/aether-roc-umbrella/README.md
+++ b/aether-roc-umbrella/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2020 Open Networking Foundation <info@opennetworking.org>
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## Aether ROC Umbrella chart
diff --git a/aether-roc-umbrella/files/opa-rbac/aether-2.0.0.rego b/aether-roc-umbrella/files/opa-rbac/aether-2.0.0.rego
index 171ba6a..3f79874 100644
--- a/aether-roc-umbrella/files/opa-rbac/aether-2.0.0.rego
+++ b/aether-roc-umbrella/files/opa-rbac/aether-2.0.0.rego
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 package aether_2_0_0
 
diff --git a/aether-roc-umbrella/files/opa-rbac/aether-3.0.0.rego b/aether-roc-umbrella/files/opa-rbac/aether-3.0.0.rego
index 29df86e..1be8744 100644
--- a/aether-roc-umbrella/files/opa-rbac/aether-3.0.0.rego
+++ b/aether-roc-umbrella/files/opa-rbac/aether-3.0.0.rego
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 package aether_3_0_0
 
diff --git a/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego b/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego
index ddf2110..27a638f 100644
--- a/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego
+++ b/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 package aether_4_0_0
 
diff --git a/aether-roc-umbrella/templates/NOTES.txt b/aether-roc-umbrella/templates/NOTES.txt
index 4dc61a3..9e22a67 100644
--- a/aether-roc-umbrella/templates/NOTES.txt
+++ b/aether-roc-umbrella/templates/NOTES.txt
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 Thank you for installing {{ .Chart.Name }} Helm chart.
 
diff --git a/aether-roc-umbrella/templates/_helpers.tpl b/aether-roc-umbrella/templates/_helpers.tpl
index 96089e8..83f8324 100644
--- a/aether-roc-umbrella/templates/_helpers.tpl
+++ b/aether-roc-umbrella/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/aether-roc-umbrella/templates/alertmanager-configmap.yaml b/aether-roc-umbrella/templates/alertmanager-configmap.yaml
index 703c11a..bb6f057 100644
--- a/aether-roc-umbrella/templates/alertmanager-configmap.yaml
+++ b/aether-roc-umbrella/templates/alertmanager-configmap.yaml
@@ -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
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/aether-roc-umbrella/templates/dashboards-templated.yaml b/aether-roc-umbrella/templates/dashboards-templated.yaml
index 7b2000b..5234f72 100644
--- a/aether-roc-umbrella/templates/dashboards-templated.yaml
+++ b/aether-roc-umbrella/templates/dashboards-templated.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/aether-roc-umbrella/templates/datasources-templated.yaml b/aether-roc-umbrella/templates/datasources-templated.yaml
index 159eb77..1f507d9 100644
--- a/aether-roc-umbrella/templates/datasources-templated.yaml
+++ b/aether-roc-umbrella/templates/datasources-templated.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/aether-roc-umbrella/templates/grafana-post-install-sh.yaml b/aether-roc-umbrella/templates/grafana-post-install-sh.yaml
index 3a7b3a9..f7e4f2e 100644
--- a/aether-roc-umbrella/templates/grafana-post-install-sh.yaml
+++ b/aether-roc-umbrella/templates/grafana-post-install-sh.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/aether-roc-umbrella/templates/opa-rbac-configmap.yaml b/aether-roc-umbrella/templates/opa-rbac-configmap.yaml
index e123fa5..7cdf89f 100644
--- a/aether-roc-umbrella/templates/opa-rbac-configmap.yaml
+++ b/aether-roc-umbrella/templates/opa-rbac-configmap.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 {{ if ".Values.onos-config.openpolicyagent.enabled" }}
 apiVersion: v1
diff --git a/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml b/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml
index 07e5ef3..9d9d109 100644
--- a/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml
+++ b/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml
@@ -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
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/aether-roc-umbrella/templates/store.yaml b/aether-roc-umbrella/templates/store.yaml
index 9de9669..baae4a6 100644
--- a/aether-roc-umbrella/templates/store.yaml
+++ b/aether-roc-umbrella/templates/store.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 {{- if .Values.global.store.consensus.enabled }}
 apiVersion: atomix.io/v2beta1
diff --git a/aether-roc-umbrella/templates/topo.yaml b/aether-roc-umbrella/templates/topo.yaml
index 519cae5..18f393b 100644
--- a/aether-roc-umbrella/templates/topo.yaml
+++ b/aether-roc-umbrella/templates/topo.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 # A topology kind representing an E2 node
 apiVersion: topo.onosproject.org/v1beta1
diff --git a/aether-roc-umbrella/tests/aether-roc-umbrella.go b/aether-roc-umbrella/tests/aether-roc-umbrella.go
index a557ad4..373c4e3 100644
--- a/aether-roc-umbrella/tests/aether-roc-umbrella.go
+++ b/aether-roc-umbrella/tests/aether-roc-umbrella.go
@@ -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
 
 package tests
 
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index b731e54..61a892e 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -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
 
 # Default values for all Aether Helm charts.
 # This is a YAML-formatted file.
diff --git a/aether-roc-websocket/.helmignore b/aether-roc-websocket/.helmignore
index f7a328e..b31d38d 100644
--- a/aether-roc-websocket/.helmignore
+++ b/aether-roc-websocket/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/aether-roc-websocket/Chart.yaml b/aether-roc-websocket/Chart.yaml
index 24401c9..e3cb8d5 100644
--- a/aether-roc-websocket/Chart.yaml
+++ b/aether-roc-websocket/Chart.yaml
@@ -1,13 +1,13 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: aether-roc-websocket
 description: Aether ROC Websocket
 kubeVersion: ">=1.15.0"
 type: application
-version: 1.1.0
+version: 1.1.1
 appVersion: v0.8.7
 keywords:
   - aether
diff --git a/aether-roc-websocket/README.md b/aether-roc-websocket/README.md
index 45dcaae..78c29a5 100644
--- a/aether-roc-websocket/README.md
+++ b/aether-roc-websocket/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## Aether ROC WebSocket
diff --git a/aether-roc-websocket/files/certs/README.md b/aether-roc-websocket/files/certs/README.md
index 11c96a2..8ce01d2 100644
--- a/aether-roc-websocket/files/certs/README.md
+++ b/aether-roc-websocket/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/aether-roc-websocket/templates/NOTES.txt b/aether-roc-websocket/templates/NOTES.txt
index c92f7ca..1df8129 100644
--- a/aether-roc-websocket/templates/NOTES.txt
+++ b/aether-roc-websocket/templates/NOTES.txt
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 Thank you for installing {{ .Chart.Name }} Helm chart.
 
diff --git a/aether-roc-websocket/templates/_helpers.tpl b/aether-roc-websocket/templates/_helpers.tpl
index c90766c..2343c79 100644
--- a/aether-roc-websocket/templates/_helpers.tpl
+++ b/aether-roc-websocket/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/aether-roc-websocket/templates/configmap.yaml b/aether-roc-websocket/templates/configmap.yaml
index 546bc84..4d9e79d 100644
--- a/aether-roc-websocket/templates/configmap.yaml
+++ b/aether-roc-websocket/templates/configmap.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/aether-roc-websocket/templates/deployment.yaml b/aether-roc-websocket/templates/deployment.yaml
index cf0630c..92f72f2 100644
--- a/aether-roc-websocket/templates/deployment.yaml
+++ b/aether-roc-websocket/templates/deployment.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/aether-roc-websocket/templates/secret.yaml b/aether-roc-websocket/templates/secret.yaml
index 693761b..1690e6f 100644
--- a/aether-roc-websocket/templates/secret.yaml
+++ b/aether-roc-websocket/templates/secret.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: Secret
diff --git a/aether-roc-websocket/templates/service.yaml b/aether-roc-websocket/templates/service.yaml
index 5d0bc96..b1df42b 100644
--- a/aether-roc-websocket/templates/service.yaml
+++ b/aether-roc-websocket/templates/service.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: Service
diff --git a/aether-roc-websocket/templates/serviceaccount.yaml b/aether-roc-websocket/templates/serviceaccount.yaml
index ef5dd83..db9fa1a 100644
--- a/aether-roc-websocket/templates/serviceaccount.yaml
+++ b/aether-roc-websocket/templates/serviceaccount.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 ---
 apiVersion: v1
diff --git a/aether-roc-websocket/values.yaml b/aether-roc-websocket/values.yaml
index 4223ce1..cdd0b3f 100644
--- a/aether-roc-websocket/values.yaml
+++ b/aether-roc-websocket/values.yaml
@@ -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
 
 # Default values for aether-roc-websocket.
 # This is a YAML-formatted file.
diff --git a/build/bin/run-roc-test b/build/bin/run-roc-test
index c163616..5da469e 100755
--- a/build/bin/run-roc-test
+++ b/build/bin/run-roc-test
@@ -1,7 +1,7 @@
 #!/bin/bash
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 # Script to build and run all of the onos integration tests
 
 set -eu -o pipefail
diff --git a/chronos-exporter/.helmignore b/chronos-exporter/.helmignore
index afb7893..7288f9a 100644
--- a/chronos-exporter/.helmignore
+++ b/chronos-exporter/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/chronos-exporter/Chart.yaml b/chronos-exporter/Chart.yaml
index bf1f827..bb8cee2 100644
--- a/chronos-exporter/Chart.yaml
+++ b/chronos-exporter/Chart.yaml
@@ -1,13 +1,13 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: chronos-exporter
 description: Chronos Exporter
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.0.21
+version: 0.0.23
 appVersion: v0.0.18
 keywords:
   - aether
diff --git a/chronos-exporter/README.md b/chronos-exporter/README.md
index 01259c0..ad53720 100644
--- a/chronos-exporter/README.md
+++ b/chronos-exporter/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## Chronos Exporter
diff --git a/chronos-exporter/files/alerts/demo-alert.yaml b/chronos-exporter/files/alerts/demo-alert.yaml
index fe1f5a6..b7872c6 100644
--- a/chronos-exporter/files/alerts/demo-alert.yaml
+++ b/chronos-exporter/files/alerts/demo-alert.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 ---
   - alert-id: 21e43108-8c6b-4c92-b80a-b1f365ae14ea
     configpath: "/sites/site[site-id=fremont]/devices/device[serial-number=752365A]"
diff --git a/chronos-exporter/files/certs/README.md b/chronos-exporter/files/certs/README.md
index 65c5a42..51f606c 100644
--- a/chronos-exporter/files/certs/README.md
+++ b/chronos-exporter/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/chronos-exporter/files/configs/MEGA_Patch_2.0.yaml b/chronos-exporter/files/configs/MEGA_Patch_2.0.yaml
index 958a28e..fa8a91b 100644
--- a/chronos-exporter/files/configs/MEGA_Patch_2.0.yaml
+++ b/chronos-exporter/files/configs/MEGA_Patch_2.0.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 enterprise:
   - enterprise-id: acme
     connectivity-service:
diff --git a/chronos-exporter/files/configs/README.md b/chronos-exporter/files/configs/README.md
index 80ade7a..0f945c2 100644
--- a/chronos-exporter/files/configs/README.md
+++ b/chronos-exporter/files/configs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation <info@opennetworking.org>
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 # Configuration
diff --git a/chronos-exporter/files/configs/demo-configuration.yaml b/chronos-exporter/files/configs/demo-configuration.yaml
index 60c775e..f1b46af 100644
--- a/chronos-exporter/files/configs/demo-configuration.yaml
+++ b/chronos-exporter/files/configs/demo-configuration.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 enterprise:
   enterprise-id: tesla
   display-name: Tesla
diff --git a/chronos-exporter/files/site-plans/fremont/floor-0.svg b/chronos-exporter/files/site-plans/fremont/floor-0.svg
index a300d8d..5f6576b 100644
--- a/chronos-exporter/files/site-plans/fremont/floor-0.svg
+++ b/chronos-exporter/files/site-plans/fremont/floor-0.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
-<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
diff --git a/chronos-exporter/files/site-plans/fremont/floor-1.svg b/chronos-exporter/files/site-plans/fremont/floor-1.svg
index 66b56f1..082014d 100644
--- a/chronos-exporter/files/site-plans/fremont/floor-1.svg
+++ b/chronos-exporter/files/site-plans/fremont/floor-1.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
-<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
diff --git a/chronos-exporter/files/site-plans/fremont/floor-2.svg b/chronos-exporter/files/site-plans/fremont/floor-2.svg
index c0ed637..59304b7 100644
--- a/chronos-exporter/files/site-plans/fremont/floor-2.svg
+++ b/chronos-exporter/files/site-plans/fremont/floor-2.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
-<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
diff --git a/chronos-exporter/files/site-plans/fremont/floor-3.svg b/chronos-exporter/files/site-plans/fremont/floor-3.svg
index cf1671e..0cc94ce 100644
--- a/chronos-exporter/files/site-plans/fremont/floor-3.svg
+++ b/chronos-exporter/files/site-plans/fremont/floor-3.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org> -->
-<!-- SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
diff --git a/chronos-exporter/templates/_helpers.tpl b/chronos-exporter/templates/_helpers.tpl
index 190001f..a4ab8bd 100644
--- a/chronos-exporter/templates/_helpers.tpl
+++ b/chronos-exporter/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 
 Expand the name of the chart.
 */}}
diff --git a/chronos-exporter/templates/configmap.yaml b/chronos-exporter/templates/configmap.yaml
index 53bdb4e..6891ec2 100644
--- a/chronos-exporter/templates/configmap.yaml
+++ b/chronos-exporter/templates/configmap.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/chronos-exporter/templates/deployment.yaml b/chronos-exporter/templates/deployment.yaml
index 4a20dbe..2283423 100644
--- a/chronos-exporter/templates/deployment.yaml
+++ b/chronos-exporter/templates/deployment.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/chronos-exporter/templates/secret.yaml b/chronos-exporter/templates/secret.yaml
index be9e3f9..a37931c 100644
--- a/chronos-exporter/templates/secret.yaml
+++ b/chronos-exporter/templates/secret.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: Secret
diff --git a/chronos-exporter/templates/service.yaml b/chronos-exporter/templates/service.yaml
index 0bc44d0..25673d6 100644
--- a/chronos-exporter/templates/service.yaml
+++ b/chronos-exporter/templates/service.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/chronos-exporter/values.yaml b/chronos-exporter/values.yaml
index 4ed3b03..c9808c4 100644
--- a/chronos-exporter/values.yaml
+++ b/chronos-exporter/values.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 nameOverride: ""
 fullnameOverride: "chronos-exporter"
diff --git a/chronos-umbrella/Chart.yaml b/chronos-umbrella/Chart.yaml
index db30c96..00fa1c0 100644
--- a/chronos-umbrella/Chart.yaml
+++ b/chronos-umbrella/Chart.yaml
@@ -1,13 +1,13 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: chronos-umbrella
 description: Chronos Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 0.1.23
+version: 0.1.24
 appVersion: v0.0.0
 keywords:
   - aether
@@ -29,15 +29,15 @@
   - name: chronos-exporter
     condition: import.chronos-exporter.enabled
     repository: "file://../chronos-exporter"
-    version: 0.0.21
+    version: 0.0.23
   - name: aether-enterprise-portal
     condition: import.aether-enterprise-portal.enabled
     repository: "file://../aether-enterprise-portal"
-    version: 0.0.6
+    version: 0.0.7
   - name: rasa-model-server
     condition: import.rasa-model-server.enabled
     repository: "file://../rasa-model-server"
-    version: 0.0.2
+    version: 0.0.3
   - name: rasa
     condition: import.rasa.chronos.enabled
     repository: https://helm.rasa.com
diff --git a/chronos-umbrella/README.md b/chronos-umbrella/README.md
index 22a8b65..bd13d1f 100644
--- a/chronos-umbrella/README.md
+++ b/chronos-umbrella/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation <info@opennetworking.org>
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## Chronos Umbrella chart
diff --git a/chronos-umbrella/templates/NOTES.txt b/chronos-umbrella/templates/NOTES.txt
index 879d855..c5c7359 100644
--- a/chronos-umbrella/templates/NOTES.txt
+++ b/chronos-umbrella/templates/NOTES.txt
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 Thank you for installing {{ .Chart.Name }} Helm chart.
 
diff --git a/chronos-umbrella/templates/_helpers.tpl b/chronos-umbrella/templates/_helpers.tpl
index 6e413de..72286dc 100644
--- a/chronos-umbrella/templates/_helpers.tpl
+++ b/chronos-umbrella/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/chronos-umbrella/templates/dashboards-templated.yaml b/chronos-umbrella/templates/dashboards-templated.yaml
index ec7f7cd..51930af 100644
--- a/chronos-umbrella/templates/dashboards-templated.yaml
+++ b/chronos-umbrella/templates/dashboards-templated.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/chronos-umbrella/templates/datasources-templated.yaml b/chronos-umbrella/templates/datasources-templated.yaml
index 8268d68..13a92f3 100644
--- a/chronos-umbrella/templates/datasources-templated.yaml
+++ b/chronos-umbrella/templates/datasources-templated.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/chronos-umbrella/tests/chronos-umbrella.go b/chronos-umbrella/tests/chronos-umbrella.go
index 9e70d56..95252e2 100644
--- a/chronos-umbrella/tests/chronos-umbrella.go
+++ b/chronos-umbrella/tests/chronos-umbrella.go
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 package tests
 
diff --git a/chronos-umbrella/values.yaml b/chronos-umbrella/values.yaml
index e377885..2e6fbcf 100644
--- a/chronos-umbrella/values.yaml
+++ b/chronos-umbrella/values.yaml
@@ -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
 
 # Default values for all Aether Helm charts.
 # This is a YAML-formatted file.
diff --git a/config-models/aether-1.x/.helmignore b/config-models/aether-1.x/.helmignore
index 01d4cd9..862263b 100644
--- a/config-models/aether-1.x/.helmignore
+++ b/config-models/aether-1.x/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/config-models/aether-1.x/Chart.yaml b/config-models/aether-1.x/Chart.yaml
index 01dadf4..71ab3d5 100644
--- a/config-models/aether-1.x/Chart.yaml
+++ b/config-models/aether-1.x/Chart.yaml
@@ -1,10 +1,10 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: config-model-aether
-version: 1.0.5
+version: 1.0.6
 kubeVersion: ">=1.18.0"
 appVersion: 1.0.0
 description: Aether config model
diff --git a/config-models/aether-1.x/files/yang/access-profile.yang b/config-models/aether-1.x/files/yang/access-profile.yang
index cad01fc..dac8d76 100755
--- a/config-models/aether-1.x/files/yang/access-profile.yang
+++ b/config-models/aether-1.x/files/yang/access-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module access-profile {
   namespace "http://opennetworking.org/aether/access-profile";
diff --git a/config-models/aether-1.x/files/yang/aether-subscriber.yang b/config-models/aether-1.x/files/yang/aether-subscriber.yang
index d4e3fbd..880dd82 100644
--- a/config-models/aether-1.x/files/yang/aether-subscriber.yang
+++ b/config-models/aether-1.x/files/yang/aether-subscriber.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module aether-subscriber {
   namespace "http://opennetworking.org/aether/subscriber";
diff --git a/config-models/aether-1.x/files/yang/apn-profile.yang b/config-models/aether-1.x/files/yang/apn-profile.yang
index b6f1cf5..015f695 100755
--- a/config-models/aether-1.x/files/yang/apn-profile.yang
+++ b/config-models/aether-1.x/files/yang/apn-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module apn-profile {
   namespace "http://opennetworking.org/aether/apn-profile";
diff --git a/config-models/aether-1.x/files/yang/qos-profile.yang b/config-models/aether-1.x/files/yang/qos-profile.yang
index c0d8025..cde5273 100755
--- a/config-models/aether-1.x/files/yang/qos-profile.yang
+++ b/config-models/aether-1.x/files/yang/qos-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module qos-profile {
   namespace "http://opennetworking.org/aether/qos-profile";
diff --git a/config-models/aether-1.x/files/yang/up-profile.yang b/config-models/aether-1.x/files/yang/up-profile.yang
index 9fac55c..1c5052d 100755
--- a/config-models/aether-1.x/files/yang/up-profile.yang
+++ b/config-models/aether-1.x/files/yang/up-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module up-profile {
   namespace "http://opennetworking.org/aether/user-plane-profile";
diff --git a/config-models/aether-1.x/templates/_helpers.tpl b/config-models/aether-1.x/templates/_helpers.tpl
index 0380f1a..bb84c33 100644
--- a/config-models/aether-1.x/templates/_helpers.tpl
+++ b/config-models/aether-1.x/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/config-models/aether-1.x/templates/model.yaml b/config-models/aether-1.x/templates/model.yaml
index f88e9f2..0b2af15 100644
--- a/config-models/aether-1.x/templates/model.yaml
+++ b/config-models/aether-1.x/templates/model.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: config.onosproject.org/v1beta1
 kind: Model
diff --git a/config-models/aether-1.x/values.yaml b/config-models/aether-1.x/values.yaml
index 1b22ea4..114bfc5 100644
--- a/config-models/aether-1.x/values.yaml
+++ b/config-models/aether-1.x/values.yaml
@@ -1,3 +1,3 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
diff --git a/config-models/aether-2.0.x/CHANGELOG.md b/config-models/aether-2.0.x/CHANGELOG.md
index 12ffa7a..2d66b6b 100644
--- a/config-models/aether-2.0.x/CHANGELOG.md
+++ b/config-models/aether-2.0.x/CHANGELOG.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 Changes on 2/3/2022
diff --git a/config-models/aether-2.0.x/Chart.yaml b/config-models/aether-2.0.x/Chart.yaml
index bcffb03..cd214d8 100644
--- a/config-models/aether-2.0.x/Chart.yaml
+++ b/config-models/aether-2.0.x/Chart.yaml
@@ -1,10 +1,10 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: config-model-aether-2
-version: 2.0.7
+version: 2.0.8
 kubeVersion: ">=1.18.0"
 appVersion: 2.0.0
 description: Aether config model
diff --git a/config-models/aether-2.0.x/files/yang/onf-aether-types.yang b/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
index 5e6fbfd..a1c71a9 100755
--- a/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-aether-types {
   namespace "http://opennetworking.org/aether/aether-types";
diff --git a/config-models/aether-2.0.x/files/yang/onf-application.yang b/config-models/aether-2.0.x/files/yang/onf-application.yang
index d8eb9d1..54dcf17 100755
--- a/config-models/aether-2.0.x/files/yang/onf-application.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-application.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 submodule onf-application {
   belongs-to onf-enterprise { prefix ent; }
diff --git a/config-models/aether-2.0.x/files/yang/onf-connectivity-service.yang b/config-models/aether-2.0.x/files/yang/onf-connectivity-service.yang
index 33c63a1..dfc8821 100755
--- a/config-models/aether-2.0.x/files/yang/onf-connectivity-service.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-connectivity-service.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-connectivity-service {
   namespace "http://opennetworking.org/aether/connectivity-service";
diff --git a/config-models/aether-2.0.x/files/yang/onf-device-group.yang b/config-models/aether-2.0.x/files/yang/onf-device-group.yang
index 41f0b70..64afd18 100755
--- a/config-models/aether-2.0.x/files/yang/onf-device-group.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-device-group.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 submodule onf-device-group {
   belongs-to onf-enterprise { prefix ent; }
diff --git a/config-models/aether-2.0.x/files/yang/onf-device.yang b/config-models/aether-2.0.x/files/yang/onf-device.yang
index b79844a..cf4ad10 100644
--- a/config-models/aether-2.0.x/files/yang/onf-device.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-device.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 submodule onf-device {
   belongs-to onf-enterprise { prefix ent; }
diff --git a/config-models/aether-2.0.x/files/yang/onf-enterprise.yang b/config-models/aether-2.0.x/files/yang/onf-enterprise.yang
index 7b83595..00334f9 100755
--- a/config-models/aether-2.0.x/files/yang/onf-enterprise.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-enterprise.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-enterprise {
   namespace "http://opennetworking.org/aether/enterprise";
diff --git a/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang b/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang
index 287122e..9808674 100755
--- a/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 submodule onf-ip-domain {
   belongs-to onf-enterprise { prefix ent; }
diff --git a/config-models/aether-2.0.x/files/yang/onf-priority-traffic-rule.yang b/config-models/aether-2.0.x/files/yang/onf-priority-traffic-rule.yang
index e73cdf7..4c8db55 100755
--- a/config-models/aether-2.0.x/files/yang/onf-priority-traffic-rule.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-priority-traffic-rule.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 submodule onf-priority-traffic-rule {
   belongs-to onf-enterprise { prefix ent; }
diff --git a/config-models/aether-2.0.x/files/yang/onf-sim-card.yang b/config-models/aether-2.0.x/files/yang/onf-sim-card.yang
index cf2ed86..c8ae80a 100644
--- a/config-models/aether-2.0.x/files/yang/onf-sim-card.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-sim-card.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 submodule onf-sim-card {
   belongs-to onf-enterprise { prefix ent; }
diff --git a/config-models/aether-2.0.x/files/yang/onf-site.yang b/config-models/aether-2.0.x/files/yang/onf-site.yang
index 3a4e333..53e2677 100755
--- a/config-models/aether-2.0.x/files/yang/onf-site.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-site.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 submodule onf-site {
   belongs-to onf-enterprise { prefix ent; }
diff --git a/config-models/aether-2.0.x/files/yang/onf-slice.yang b/config-models/aether-2.0.x/files/yang/onf-slice.yang
index 2965f86..f59619a 100755
--- a/config-models/aether-2.0.x/files/yang/onf-slice.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-slice.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 submodule onf-slice {
   belongs-to onf-enterprise { prefix ent; }
diff --git a/config-models/aether-2.0.x/files/yang/onf-template.yang b/config-models/aether-2.0.x/files/yang/onf-template.yang
index 518d8b9..3734093 100755
--- a/config-models/aether-2.0.x/files/yang/onf-template.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-template.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 submodule onf-template {
   belongs-to onf-enterprise { prefix ent; }
diff --git a/config-models/aether-2.0.x/files/yang/onf-traffic-class.yang b/config-models/aether-2.0.x/files/yang/onf-traffic-class.yang
index 69ae702..f8658fb 100755
--- a/config-models/aether-2.0.x/files/yang/onf-traffic-class.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-traffic-class.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 submodule onf-traffic-class {
   belongs-to onf-enterprise { prefix ent; }
diff --git a/config-models/aether-2.0.x/files/yang/onf-upf.yang b/config-models/aether-2.0.x/files/yang/onf-upf.yang
index 32bee7a..72a7ec9 100755
--- a/config-models/aether-2.0.x/files/yang/onf-upf.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-upf.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 submodule onf-upf {
   belongs-to onf-enterprise { prefix ent; }
diff --git a/config-models/aether-2.0.x/templates/_helpers.tpl b/config-models/aether-2.0.x/templates/_helpers.tpl
index 0380f1a..bb84c33 100644
--- a/config-models/aether-2.0.x/templates/_helpers.tpl
+++ b/config-models/aether-2.0.x/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/config-models/aether-2.0.x/templates/model.yaml b/config-models/aether-2.0.x/templates/model.yaml
index b6ef0f6..f3a73f0 100644
--- a/config-models/aether-2.0.x/templates/model.yaml
+++ b/config-models/aether-2.0.x/templates/model.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: config.onosproject.org/v1beta1
 kind: Model
diff --git a/config-models/aether-2.0.x/values.yaml b/config-models/aether-2.0.x/values.yaml
index 2e984ed..aec2bd5 100644
--- a/config-models/aether-2.0.x/values.yaml
+++ b/config-models/aether-2.0.x/values.yaml
@@ -1,3 +1,3 @@
 # 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
diff --git a/config-models/aether-2.1.x/.helmignore b/config-models/aether-2.1.x/.helmignore
index 01d4cd9..862263b 100644
--- a/config-models/aether-2.1.x/.helmignore
+++ b/config-models/aether-2.1.x/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/config-models/aether-2.1.x/Chart.yaml b/config-models/aether-2.1.x/Chart.yaml
index 93cfa93..f073808 100644
--- a/config-models/aether-2.1.x/Chart.yaml
+++ b/config-models/aether-2.1.x/Chart.yaml
@@ -1,10 +1,10 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: config-model-aether-2
-version: 2.1.5
+version: 2.1.6
 kubeVersion: ">=1.18.0"
 appVersion: 2.1.0
 description: Aether config model
diff --git a/config-models/aether-2.1.x/files/yang/access-profile.yang b/config-models/aether-2.1.x/files/yang/access-profile.yang
index 080ab14..49009fe 100755
--- a/config-models/aether-2.1.x/files/yang/access-profile.yang
+++ b/config-models/aether-2.1.x/files/yang/access-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module access-profile {
   namespace "http://opennetworking.org/aether/access-profile";
diff --git a/config-models/aether-2.1.x/files/yang/aether-subscriber.yang b/config-models/aether-2.1.x/files/yang/aether-subscriber.yang
index a3e7220..397bd97 100755
--- a/config-models/aether-2.1.x/files/yang/aether-subscriber.yang
+++ b/config-models/aether-2.1.x/files/yang/aether-subscriber.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module aether-subscriber {
   namespace "http://opennetworking.org/aether/subscriber";
diff --git a/config-models/aether-2.1.x/files/yang/apn-profile.yang b/config-models/aether-2.1.x/files/yang/apn-profile.yang
index 8445cc8..3d0ba48 100755
--- a/config-models/aether-2.1.x/files/yang/apn-profile.yang
+++ b/config-models/aether-2.1.x/files/yang/apn-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module apn-profile {
   namespace "http://opennetworking.org/aether/apn-profile";
diff --git a/config-models/aether-2.1.x/files/yang/connectivity-service.yang b/config-models/aether-2.1.x/files/yang/connectivity-service.yang
index 139a93f..7a00b2f 100755
--- a/config-models/aether-2.1.x/files/yang/connectivity-service.yang
+++ b/config-models/aether-2.1.x/files/yang/connectivity-service.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module connectivity-service {
   namespace "http://opennetworking.org/aether/connectivity-service";
diff --git a/config-models/aether-2.1.x/files/yang/enterprise.yang b/config-models/aether-2.1.x/files/yang/enterprise.yang
index 25dd051..dfb1b60 100755
--- a/config-models/aether-2.1.x/files/yang/enterprise.yang
+++ b/config-models/aether-2.1.x/files/yang/enterprise.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module enterprise {
   namespace "http://opennetworking.org/aether/enterprise";
diff --git a/config-models/aether-2.1.x/files/yang/qos-profile.yang b/config-models/aether-2.1.x/files/yang/qos-profile.yang
index a150263..35204d9 100755
--- a/config-models/aether-2.1.x/files/yang/qos-profile.yang
+++ b/config-models/aether-2.1.x/files/yang/qos-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module qos-profile {
   namespace "http://opennetworking.org/aether/qos-profile";
diff --git a/config-models/aether-2.1.x/files/yang/security-profile.yang b/config-models/aether-2.1.x/files/yang/security-profile.yang
index 00413b1..e6c5367 100755
--- a/config-models/aether-2.1.x/files/yang/security-profile.yang
+++ b/config-models/aether-2.1.x/files/yang/security-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module security-profile {
   namespace "http://opennetworking.org/aether/security-profile";
diff --git a/config-models/aether-2.1.x/files/yang/service-group.yang b/config-models/aether-2.1.x/files/yang/service-group.yang
index 8b4add1..55f0f6b 100755
--- a/config-models/aether-2.1.x/files/yang/service-group.yang
+++ b/config-models/aether-2.1.x/files/yang/service-group.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module service-group {
   namespace "http://opennetworking.org/aether/service-group";
diff --git a/config-models/aether-2.1.x/files/yang/service-policy.yang b/config-models/aether-2.1.x/files/yang/service-policy.yang
index fa83a38..a169402 100755
--- a/config-models/aether-2.1.x/files/yang/service-policy.yang
+++ b/config-models/aether-2.1.x/files/yang/service-policy.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module service-policy {
   namespace "http://opennetworking.org/aether/service-policy";
diff --git a/config-models/aether-2.1.x/files/yang/service-rule.yang b/config-models/aether-2.1.x/files/yang/service-rule.yang
index b39c9e9..49af65f 100755
--- a/config-models/aether-2.1.x/files/yang/service-rule.yang
+++ b/config-models/aether-2.1.x/files/yang/service-rule.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module service-rule {
   namespace "http://opennetworking.org/aether/service-rule";
diff --git a/config-models/aether-2.1.x/files/yang/up-profile.yang b/config-models/aether-2.1.x/files/yang/up-profile.yang
index bf17f89..723758f 100755
--- a/config-models/aether-2.1.x/files/yang/up-profile.yang
+++ b/config-models/aether-2.1.x/files/yang/up-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module up-profile {
   namespace "http://opennetworking.org/aether/user-plane-profile";
diff --git a/config-models/aether-2.1.x/templates/_helpers.tpl b/config-models/aether-2.1.x/templates/_helpers.tpl
index 0380f1a..bb84c33 100644
--- a/config-models/aether-2.1.x/templates/_helpers.tpl
+++ b/config-models/aether-2.1.x/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/config-models/aether-2.1.x/templates/model.yaml b/config-models/aether-2.1.x/templates/model.yaml
index 84d2fbb..b86c57e 100644
--- a/config-models/aether-2.1.x/templates/model.yaml
+++ b/config-models/aether-2.1.x/templates/model.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: config.onosproject.org/v1beta1
 kind: Model
diff --git a/config-models/aether-2.1.x/values.yaml b/config-models/aether-2.1.x/values.yaml
index 2e984ed..aec2bd5 100644
--- a/config-models/aether-2.1.x/values.yaml
+++ b/config-models/aether-2.1.x/values.yaml
@@ -1,3 +1,3 @@
 # 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
diff --git a/config-models/aether-2.2.x/Chart.yaml b/config-models/aether-2.2.x/Chart.yaml
index 9226faa..ad85a67 100644
--- a/config-models/aether-2.2.x/Chart.yaml
+++ b/config-models/aether-2.2.x/Chart.yaml
@@ -1,10 +1,10 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: config-model-aether
-version: 2.2.4
+version: 2.2.5
 kubeVersion: ">=1.18.0"
 appVersion: 2.2.0
 description: Aether config model
diff --git a/config-models/aether-2.2.x/files/yang/access-profile.yang b/config-models/aether-2.2.x/files/yang/access-profile.yang
index 080ab14..49009fe 100755
--- a/config-models/aether-2.2.x/files/yang/access-profile.yang
+++ b/config-models/aether-2.2.x/files/yang/access-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module access-profile {
   namespace "http://opennetworking.org/aether/access-profile";
diff --git a/config-models/aether-2.2.x/files/yang/aether-subscriber.yang b/config-models/aether-2.2.x/files/yang/aether-subscriber.yang
index 5cfa67e..01d419a 100755
--- a/config-models/aether-2.2.x/files/yang/aether-subscriber.yang
+++ b/config-models/aether-2.2.x/files/yang/aether-subscriber.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module aether-subscriber {
   namespace "http://opennetworking.org/aether/subscriber";
diff --git a/config-models/aether-2.2.x/files/yang/apn-profile.yang b/config-models/aether-2.2.x/files/yang/apn-profile.yang
index 8445cc8..3d0ba48 100755
--- a/config-models/aether-2.2.x/files/yang/apn-profile.yang
+++ b/config-models/aether-2.2.x/files/yang/apn-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module apn-profile {
   namespace "http://opennetworking.org/aether/apn-profile";
diff --git a/config-models/aether-2.2.x/files/yang/connectivity-service.yang b/config-models/aether-2.2.x/files/yang/connectivity-service.yang
index 139a93f..7a00b2f 100755
--- a/config-models/aether-2.2.x/files/yang/connectivity-service.yang
+++ b/config-models/aether-2.2.x/files/yang/connectivity-service.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module connectivity-service {
   namespace "http://opennetworking.org/aether/connectivity-service";
diff --git a/config-models/aether-2.2.x/files/yang/enterprise.yang b/config-models/aether-2.2.x/files/yang/enterprise.yang
index b556638..2bf1bdf 100755
--- a/config-models/aether-2.2.x/files/yang/enterprise.yang
+++ b/config-models/aether-2.2.x/files/yang/enterprise.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module enterprise {
   namespace "http://opennetworking.org/aether/enterprise";
diff --git a/config-models/aether-2.2.x/files/yang/qos-profile.yang b/config-models/aether-2.2.x/files/yang/qos-profile.yang
index 85b6630..2dfaf20 100755
--- a/config-models/aether-2.2.x/files/yang/qos-profile.yang
+++ b/config-models/aether-2.2.x/files/yang/qos-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module qos-profile {
   namespace "http://opennetworking.org/aether/qos-profile";
diff --git a/config-models/aether-2.2.x/files/yang/security-profile.yang b/config-models/aether-2.2.x/files/yang/security-profile.yang
index e060487..0655c34 100755
--- a/config-models/aether-2.2.x/files/yang/security-profile.yang
+++ b/config-models/aether-2.2.x/files/yang/security-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module security-profile {
   namespace "http://opennetworking.org/aether/security-profile";
diff --git a/config-models/aether-2.2.x/files/yang/service-group.yang b/config-models/aether-2.2.x/files/yang/service-group.yang
index bb5ddf2..460463f 100755
--- a/config-models/aether-2.2.x/files/yang/service-group.yang
+++ b/config-models/aether-2.2.x/files/yang/service-group.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module service-group {
   namespace "http://opennetworking.org/aether/service-group";
diff --git a/config-models/aether-2.2.x/files/yang/service-policy.yang b/config-models/aether-2.2.x/files/yang/service-policy.yang
index d30f1ad..e6598a7 100755
--- a/config-models/aether-2.2.x/files/yang/service-policy.yang
+++ b/config-models/aether-2.2.x/files/yang/service-policy.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module service-policy {
   namespace "http://opennetworking.org/aether/service-policy";
diff --git a/config-models/aether-2.2.x/files/yang/service-rule.yang b/config-models/aether-2.2.x/files/yang/service-rule.yang
index efb0539..2007f96 100755
--- a/config-models/aether-2.2.x/files/yang/service-rule.yang
+++ b/config-models/aether-2.2.x/files/yang/service-rule.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module service-rule {
   namespace "http://opennetworking.org/aether/service-rule";
diff --git a/config-models/aether-2.2.x/files/yang/up-profile.yang b/config-models/aether-2.2.x/files/yang/up-profile.yang
index bf17f89..723758f 100755
--- a/config-models/aether-2.2.x/files/yang/up-profile.yang
+++ b/config-models/aether-2.2.x/files/yang/up-profile.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module up-profile {
   namespace "http://opennetworking.org/aether/user-plane-profile";
diff --git a/config-models/aether-2.2.x/templates/_helpers.tpl b/config-models/aether-2.2.x/templates/_helpers.tpl
index 0380f1a..bb84c33 100644
--- a/config-models/aether-2.2.x/templates/_helpers.tpl
+++ b/config-models/aether-2.2.x/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/config-models/aether-2.2.x/templates/model.yaml b/config-models/aether-2.2.x/templates/model.yaml
index 302c031..1dac8f7 100644
--- a/config-models/aether-2.2.x/templates/model.yaml
+++ b/config-models/aether-2.2.x/templates/model.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: config.onosproject.org/v1beta1
 kind: Model
diff --git a/config-models/aether-2.2.x/values.yaml b/config-models/aether-2.2.x/values.yaml
index 2e984ed..aec2bd5 100644
--- a/config-models/aether-2.2.x/values.yaml
+++ b/config-models/aether-2.2.x/values.yaml
@@ -1,3 +1,3 @@
 # 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
diff --git a/config-models/aether-3.x/Chart.yaml b/config-models/aether-3.x/Chart.yaml
index c073e1e..e5e434c 100644
--- a/config-models/aether-3.x/Chart.yaml
+++ b/config-models/aether-3.x/Chart.yaml
@@ -1,10 +1,10 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: config-model-aether-3
-version: 3.0.15
+version: 3.0.16
 kubeVersion: ">=1.18.0"
 appVersion: 3.0.0
 description: Aether config model
diff --git a/config-models/aether-3.x/files/yang/aether-types.yang b/config-models/aether-3.x/files/yang/aether-types.yang
index b8de573..86ef630 100755
--- a/config-models/aether-3.x/files/yang/aether-types.yang
+++ b/config-models/aether-3.x/files/yang/aether-types.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module aether-types {
   namespace "http://opennetworking.org/aether/aether-types";
diff --git a/config-models/aether-3.x/files/yang/ap-list.yang b/config-models/aether-3.x/files/yang/ap-list.yang
index cb0ecde..49fc76a 100755
--- a/config-models/aether-3.x/files/yang/ap-list.yang
+++ b/config-models/aether-3.x/files/yang/ap-list.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module ap-list {
   namespace "http://opennetworking.org/aether/ap-list";
diff --git a/config-models/aether-3.x/files/yang/application.yang b/config-models/aether-3.x/files/yang/application.yang
index fcc05e3..d62c957 100755
--- a/config-models/aether-3.x/files/yang/application.yang
+++ b/config-models/aether-3.x/files/yang/application.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module application {
   namespace "http://opennetworking.org/enterprise/application";
diff --git a/config-models/aether-3.x/files/yang/connectivity-service.yang b/config-models/aether-3.x/files/yang/connectivity-service.yang
index aa97da3..0d6e929 100755
--- a/config-models/aether-3.x/files/yang/connectivity-service.yang
+++ b/config-models/aether-3.x/files/yang/connectivity-service.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module connectivity-service {
   namespace "http://opennetworking.org/aether/connectivity-service";
diff --git a/config-models/aether-3.x/files/yang/device-group.yang b/config-models/aether-3.x/files/yang/device-group.yang
index feb0337..d6ae9a5 100755
--- a/config-models/aether-3.x/files/yang/device-group.yang
+++ b/config-models/aether-3.x/files/yang/device-group.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module device-group {
   namespace "http://opennetworking.org/aether/device-group";
diff --git a/config-models/aether-3.x/files/yang/enterprise.yang b/config-models/aether-3.x/files/yang/enterprise.yang
index 8128e6d..160e691 100755
--- a/config-models/aether-3.x/files/yang/enterprise.yang
+++ b/config-models/aether-3.x/files/yang/enterprise.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module enterprise {
   namespace "http://opennetworking.org/aether/enterprise";
diff --git a/config-models/aether-3.x/files/yang/ip-domain.yang b/config-models/aether-3.x/files/yang/ip-domain.yang
index 9efd41d..ee920b1 100755
--- a/config-models/aether-3.x/files/yang/ip-domain.yang
+++ b/config-models/aether-3.x/files/yang/ip-domain.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module ip-domain {
   namespace "http://opennetworking.org/aether/ip-domain";
diff --git a/config-models/aether-3.x/files/yang/site.yang b/config-models/aether-3.x/files/yang/site.yang
index 5c4a31c..a8653f0 100755
--- a/config-models/aether-3.x/files/yang/site.yang
+++ b/config-models/aether-3.x/files/yang/site.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module site {
   namespace "http://opennetworking.org/aether/site";
diff --git a/config-models/aether-3.x/files/yang/template.yang b/config-models/aether-3.x/files/yang/template.yang
index 95bda57..6f9d291 100755
--- a/config-models/aether-3.x/files/yang/template.yang
+++ b/config-models/aether-3.x/files/yang/template.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module template {
   namespace "http://opennetworking.org/aether/template";
diff --git a/config-models/aether-3.x/files/yang/traffic-class.yang b/config-models/aether-3.x/files/yang/traffic-class.yang
index ce9aeb5..88a9495 100755
--- a/config-models/aether-3.x/files/yang/traffic-class.yang
+++ b/config-models/aether-3.x/files/yang/traffic-class.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module traffic-class {
   namespace "http://opennetworking.org/aether/traffic-class";
diff --git a/config-models/aether-3.x/files/yang/upf.yang b/config-models/aether-3.x/files/yang/upf.yang
index 3c56722..433c23b 100755
--- a/config-models/aether-3.x/files/yang/upf.yang
+++ b/config-models/aether-3.x/files/yang/upf.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module upf {
   namespace "http://opennetworking.org/aether/upf";
diff --git a/config-models/aether-3.x/files/yang/vcs.yang b/config-models/aether-3.x/files/yang/vcs.yang
index 5799143..5e8c5f7 100755
--- a/config-models/aether-3.x/files/yang/vcs.yang
+++ b/config-models/aether-3.x/files/yang/vcs.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module vcs {
   namespace "http://opennetworking.org/aether/vcs";
diff --git a/config-models/aether-3.x/templates/_helpers.tpl b/config-models/aether-3.x/templates/_helpers.tpl
index 0380f1a..bb84c33 100644
--- a/config-models/aether-3.x/templates/_helpers.tpl
+++ b/config-models/aether-3.x/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/config-models/aether-3.x/templates/model.yaml b/config-models/aether-3.x/templates/model.yaml
index 949b436..86db976 100644
--- a/config-models/aether-3.x/templates/model.yaml
+++ b/config-models/aether-3.x/templates/model.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: config.onosproject.org/v1beta1
 kind: Model
diff --git a/config-models/aether-3.x/values.yaml b/config-models/aether-3.x/values.yaml
index 2e984ed..aec2bd5 100644
--- a/config-models/aether-3.x/values.yaml
+++ b/config-models/aether-3.x/values.yaml
@@ -1,3 +1,3 @@
 # 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
diff --git a/config-models/aether-4.x/CHANGELOG.md b/config-models/aether-4.x/CHANGELOG.md
index a873a5d..c8d58ec 100644
--- a/config-models/aether-4.x/CHANGELOG.md
+++ b/config-models/aether-4.x/CHANGELOG.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 Changes on 11/1/2021
diff --git a/config-models/aether-4.x/Chart.yaml b/config-models/aether-4.x/Chart.yaml
index a9c80ca..e7cf3ad 100644
--- a/config-models/aether-4.x/Chart.yaml
+++ b/config-models/aether-4.x/Chart.yaml
@@ -1,10 +1,10 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: config-model-aether-4
-version: 4.0.17
+version: 4.0.18
 kubeVersion: ">=1.18.0"
 appVersion: 4.0.0
 description: Aether config model
diff --git a/config-models/aether-4.x/files/yang/onf-aether-types.yang b/config-models/aether-4.x/files/yang/onf-aether-types.yang
index 679648e..9d9c892 100755
--- a/config-models/aether-4.x/files/yang/onf-aether-types.yang
+++ b/config-models/aether-4.x/files/yang/onf-aether-types.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-aether-types {
   namespace "http://opennetworking.org/aether/aether-types";
diff --git a/config-models/aether-4.x/files/yang/onf-application.yang b/config-models/aether-4.x/files/yang/onf-application.yang
index c48cab1..e774944 100755
--- a/config-models/aether-4.x/files/yang/onf-application.yang
+++ b/config-models/aether-4.x/files/yang/onf-application.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-application {
   namespace "http://opennetworking.org/enterprise/application";
diff --git a/config-models/aether-4.x/files/yang/onf-connectivity-service.yang b/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
index e1d53b6..009fc6c 100755
--- a/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
+++ b/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-connectivity-service {
   namespace "http://opennetworking.org/aether/connectivity-service";
diff --git a/config-models/aether-4.x/files/yang/onf-device-group.yang b/config-models/aether-4.x/files/yang/onf-device-group.yang
index a93c295..0aac881 100755
--- a/config-models/aether-4.x/files/yang/onf-device-group.yang
+++ b/config-models/aether-4.x/files/yang/onf-device-group.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-device-group {
   namespace "http://opennetworking.org/aether/device-group";
diff --git a/config-models/aether-4.x/files/yang/onf-enterprise.yang b/config-models/aether-4.x/files/yang/onf-enterprise.yang
index 16ad5f9..906d8ac 100755
--- a/config-models/aether-4.x/files/yang/onf-enterprise.yang
+++ b/config-models/aether-4.x/files/yang/onf-enterprise.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-enterprise {
   namespace "http://opennetworking.org/aether/enterprise";
diff --git a/config-models/aether-4.x/files/yang/onf-ip-domain.yang b/config-models/aether-4.x/files/yang/onf-ip-domain.yang
index e896cc5..629256a 100755
--- a/config-models/aether-4.x/files/yang/onf-ip-domain.yang
+++ b/config-models/aether-4.x/files/yang/onf-ip-domain.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-ip-domain {
   namespace "http://opennetworking.org/aether/ip-domain";
diff --git a/config-models/aether-4.x/files/yang/onf-site.yang b/config-models/aether-4.x/files/yang/onf-site.yang
index b5f22c4..1695a35 100755
--- a/config-models/aether-4.x/files/yang/onf-site.yang
+++ b/config-models/aether-4.x/files/yang/onf-site.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-site {
   namespace "http://opennetworking.org/aether/site";
diff --git a/config-models/aether-4.x/files/yang/onf-template.yang b/config-models/aether-4.x/files/yang/onf-template.yang
index bbd94ef..e6af73e 100755
--- a/config-models/aether-4.x/files/yang/onf-template.yang
+++ b/config-models/aether-4.x/files/yang/onf-template.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-template {
   namespace "http://opennetworking.org/aether/template";
diff --git a/config-models/aether-4.x/files/yang/onf-traffic-class.yang b/config-models/aether-4.x/files/yang/onf-traffic-class.yang
index a592267..2d9f135 100755
--- a/config-models/aether-4.x/files/yang/onf-traffic-class.yang
+++ b/config-models/aether-4.x/files/yang/onf-traffic-class.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-traffic-class {
   namespace "http://opennetworking.org/aether/traffic-class";
diff --git a/config-models/aether-4.x/files/yang/onf-upf.yang b/config-models/aether-4.x/files/yang/onf-upf.yang
index 5c8be50..4274acb 100755
--- a/config-models/aether-4.x/files/yang/onf-upf.yang
+++ b/config-models/aether-4.x/files/yang/onf-upf.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-upf {
   namespace "http://opennetworking.org/aether/upf";
diff --git a/config-models/aether-4.x/files/yang/onf-vcs.yang b/config-models/aether-4.x/files/yang/onf-vcs.yang
index c275565..89b8304 100755
--- a/config-models/aether-4.x/files/yang/onf-vcs.yang
+++ b/config-models/aether-4.x/files/yang/onf-vcs.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module onf-vcs {
   namespace "http://opennetworking.org/aether/vcs";
diff --git a/config-models/aether-4.x/templates/_helpers.tpl b/config-models/aether-4.x/templates/_helpers.tpl
index 0380f1a..bb84c33 100644
--- a/config-models/aether-4.x/templates/_helpers.tpl
+++ b/config-models/aether-4.x/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/config-models/aether-4.x/templates/model.yaml b/config-models/aether-4.x/templates/model.yaml
index 301bfae..0369022 100644
--- a/config-models/aether-4.x/templates/model.yaml
+++ b/config-models/aether-4.x/templates/model.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: config.onosproject.org/v1beta1
 kind: Model
diff --git a/config-models/aether-4.x/values.yaml b/config-models/aether-4.x/values.yaml
index 2e984ed..aec2bd5 100644
--- a/config-models/aether-4.x/values.yaml
+++ b/config-models/aether-4.x/values.yaml
@@ -1,3 +1,3 @@
 # 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
diff --git a/config-models/plproxy-1.x/Chart.yaml b/config-models/plproxy-1.x/Chart.yaml
index ac62ff5..3effdd4 100755
--- a/config-models/plproxy-1.x/Chart.yaml
+++ b/config-models/plproxy-1.x/Chart.yaml
@@ -1,10 +1,10 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: config-model-plproxy
-version: 1.0.1
+version: 1.0.2
 kubeVersion: ">=1.18.0"
 appVersion: 1.0.0
 description: Prom label proxy config model
diff --git a/config-models/plproxy-1.x/files/yang/prom-label-proxy.yang b/config-models/plproxy-1.x/files/yang/prom-label-proxy.yang
index abc5c66..4bfa3a7 100755
--- a/config-models/plproxy-1.x/files/yang/prom-label-proxy.yang
+++ b/config-models/plproxy-1.x/files/yang/prom-label-proxy.yang
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 module prom-label-proxy {
   namespace "http://opennetworking.org/promlabelproxy/config/";
diff --git a/config-models/plproxy-1.x/templates/_helpers.tpl b/config-models/plproxy-1.x/templates/_helpers.tpl
index 3370042..4b28369 100755
--- a/config-models/plproxy-1.x/templates/_helpers.tpl
+++ b/config-models/plproxy-1.x/templates/_helpers.tpl
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Open Networking Foundation
 //
-// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+// SPDX-License-Identifier: Apache-2.0
 
 {{/* vim: set filetype=mustache: */}}
 {{/*
diff --git a/config-models/plproxy-1.x/templates/model.yaml b/config-models/plproxy-1.x/templates/model.yaml
index bc13d6f..b467cb8 100755
--- a/config-models/plproxy-1.x/templates/model.yaml
+++ b/config-models/plproxy-1.x/templates/model.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: config.onosproject.org/v1beta1
 kind: Model
diff --git a/config-models/plproxy-1.x/values.yaml b/config-models/plproxy-1.x/values.yaml
index 2e984ed..aec2bd5 100755
--- a/config-models/plproxy-1.x/values.yaml
+++ b/config-models/plproxy-1.x/values.yaml
@@ -1,3 +1,3 @@
 # 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
diff --git a/demo-exporter/.helmignore b/demo-exporter/.helmignore
index 01d4cd9..862263b 100644
--- a/demo-exporter/.helmignore
+++ b/demo-exporter/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/demo-exporter/Chart.yaml b/demo-exporter/Chart.yaml
index b6fc6d9..4d53ba5 100644
--- a/demo-exporter/Chart.yaml
+++ b/demo-exporter/Chart.yaml
@@ -1,13 +1,13 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: demo-exporter
 description: Aether ROC Demo Exporter
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: v0.0.0
 keywords:
   - aether
diff --git a/demo-exporter/README.md b/demo-exporter/README.md
index 54d8c58..cbc0ad1 100644
--- a/demo-exporter/README.md
+++ b/demo-exporter/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## Aether Demo Exporter
diff --git a/demo-exporter/files/certs/README.md b/demo-exporter/files/certs/README.md
index ae3f841..a35616f 100644
--- a/demo-exporter/files/certs/README.md
+++ b/demo-exporter/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/demo-exporter/templates/_helpers.tpl b/demo-exporter/templates/_helpers.tpl
index 5907a5b..8dc1857 100644
--- a/demo-exporter/templates/_helpers.tpl
+++ b/demo-exporter/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 
 Expand the name of the chart.
 */}}
diff --git a/demo-exporter/templates/deployment.yaml b/demo-exporter/templates/deployment.yaml
index 7846122..cb51907 100644
--- a/demo-exporter/templates/deployment.yaml
+++ b/demo-exporter/templates/deployment.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/demo-exporter/templates/secret.yaml b/demo-exporter/templates/secret.yaml
index 6365a60..a7d1aa7 100644
--- a/demo-exporter/templates/secret.yaml
+++ b/demo-exporter/templates/secret.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: Secret
diff --git a/demo-exporter/templates/service.yaml b/demo-exporter/templates/service.yaml
index 880d333..473e56f 100644
--- a/demo-exporter/templates/service.yaml
+++ b/demo-exporter/templates/service.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/demo-exporter/values.yaml b/demo-exporter/values.yaml
index f92e9c9..692c105 100644
--- a/demo-exporter/values.yaml
+++ b/demo-exporter/values.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 nameOverride: ""
 fullnameOverride: "demo-exporter"
diff --git a/prom-label-proxy/.helmignore b/prom-label-proxy/.helmignore
index 01d4cd9..862263b 100644
--- a/prom-label-proxy/.helmignore
+++ b/prom-label-proxy/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/prom-label-proxy/Chart.yaml b/prom-label-proxy/Chart.yaml
index 454beff..b73946a 100644
--- a/prom-label-proxy/Chart.yaml
+++ b/prom-label-proxy/Chart.yaml
@@ -1,12 +1,12 @@
 # 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
 
 apiVersion: v2
 name: prom-label-proxy
 kubeVersion: ">=1.17.0"
 type: application
-version: 0.1.1
+version: 0.1.2
 appVersion: v0.3.6
 description: Prom Label Proxy
 keywords:
diff --git a/prom-label-proxy/files/certs/README.md b/prom-label-proxy/files/certs/README.md
index 17dfe1c..cb8fbfe 100644
--- a/prom-label-proxy/files/certs/README.md
+++ b/prom-label-proxy/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/prom-label-proxy/templates/_helpers.tpl b/prom-label-proxy/templates/_helpers.tpl
index bb3c234..66c35f8 100644
--- a/prom-label-proxy/templates/_helpers.tpl
+++ b/prom-label-proxy/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/prom-label-proxy/templates/deployment.yaml b/prom-label-proxy/templates/deployment.yaml
index 3d8cd09..8243616 100644
--- a/prom-label-proxy/templates/deployment.yaml
+++ b/prom-label-proxy/templates/deployment.yaml
@@ -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
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/prom-label-proxy/templates/secret.yaml b/prom-label-proxy/templates/secret.yaml
index 0e61df0..e5afccb 100644
--- a/prom-label-proxy/templates/secret.yaml
+++ b/prom-label-proxy/templates/secret.yaml
@@ -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
 
 apiVersion: v1
 kind: Secret
diff --git a/prom-label-proxy/templates/service.yaml b/prom-label-proxy/templates/service.yaml
index e606dce..02181ac 100644
--- a/prom-label-proxy/templates/service.yaml
+++ b/prom-label-proxy/templates/service.yaml
@@ -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
 ---
 apiVersion: v1
 kind: Service
diff --git a/prom-label-proxy/values.yaml b/prom-label-proxy/values.yaml
index 11d6217..99bfac4 100644
--- a/prom-label-proxy/values.yaml
+++ b/prom-label-proxy/values.yaml
@@ -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
 nameOverride: ""
 fullnameOverride: ""
 
diff --git a/rasa-model-server/.helmignore b/rasa-model-server/.helmignore
index 5e5908d..98c5305 100644
--- a/rasa-model-server/.helmignore
+++ b/rasa-model-server/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2022 Open Networking Foundation
 #
-# 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/rasa-model-server/Chart.yaml b/rasa-model-server/Chart.yaml
index f03d798..d41c8f2 100644
--- a/rasa-model-server/Chart.yaml
+++ b/rasa-model-server/Chart.yaml
@@ -1,13 +1,13 @@
 # SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
 name: rasa-model-server
 description: Rasa Model Server
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.0.2
+version: 0.0.3
 appVersion: v0.0.12
 keywords:
   - aether
diff --git a/rasa-model-server/README.md b/rasa-model-server/README.md
index 1b6cd77..9e6b244 100644
--- a/rasa-model-server/README.md
+++ b/rasa-model-server/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2022 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## Rasa Model Server
diff --git a/rasa-model-server/files/certs/README.md b/rasa-model-server/files/certs/README.md
index ff75757..3a45831 100644
--- a/rasa-model-server/files/certs/README.md
+++ b/rasa-model-server/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2022 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/rasa-model-server/templates/_helpers.tpl b/rasa-model-server/templates/_helpers.tpl
index 893acd0..7e21793 100644
--- a/rasa-model-server/templates/_helpers.tpl
+++ b/rasa-model-server/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 
 Expand the name of the chart.
 */}}
diff --git a/rasa-model-server/templates/deployment.yaml b/rasa-model-server/templates/deployment.yaml
index baf9f0a..cc8d06c 100644
--- a/rasa-model-server/templates/deployment.yaml
+++ b/rasa-model-server/templates/deployment.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/rasa-model-server/templates/secret.yaml b/rasa-model-server/templates/secret.yaml
index 292c0c1..fb2066f 100644
--- a/rasa-model-server/templates/secret.yaml
+++ b/rasa-model-server/templates/secret.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v1
 kind: Secret
diff --git a/rasa-model-server/templates/service.yaml b/rasa-model-server/templates/service.yaml
index 56e85d2..912c555 100644
--- a/rasa-model-server/templates/service.yaml
+++ b/rasa-model-server/templates/service.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/rasa-model-server/values.yaml b/rasa-model-server/values.yaml
index fac7d12..82e9623 100644
--- a/rasa-model-server/values.yaml
+++ b/rasa-model-server/values.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 nameOverride: ""
 fullnameOverride: "rasa-model-server"
diff --git a/sdcore-adapter-v2/.helmignore b/sdcore-adapter-v2/.helmignore
index 01d4cd9..862263b 100644
--- a/sdcore-adapter-v2/.helmignore
+++ b/sdcore-adapter-v2/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/sdcore-adapter-v2/Chart.yaml b/sdcore-adapter-v2/Chart.yaml
index 973e839..803aff0 100644
--- a/sdcore-adapter-v2/Chart.yaml
+++ b/sdcore-adapter-v2/Chart.yaml
@@ -1,12 +1,12 @@
 # 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
 
 apiVersion: v2
 name: sdcore-adapter-v2
 kubeVersion: ">=1.17.0"
 type: application
-version: 2.0.2
+version: 2.0.3
 appVersion: v2.0.0
 description: Aether SD-Core Adapter
 keywords:
diff --git a/sdcore-adapter-v2/README.md b/sdcore-adapter-v2/README.md
index c589608..15c003f 100644
--- a/sdcore-adapter-v2/README.md
+++ b/sdcore-adapter-v2/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## ONOS SD-Core Adapter
diff --git a/sdcore-adapter-v2/files/certs/README.md b/sdcore-adapter-v2/files/certs/README.md
index ae3f841..a35616f 100644
--- a/sdcore-adapter-v2/files/certs/README.md
+++ b/sdcore-adapter-v2/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/sdcore-adapter-v2/files/configs/README.md b/sdcore-adapter-v2/files/configs/README.md
index cade213..85a3e3c 100644
--- a/sdcore-adapter-v2/files/configs/README.md
+++ b/sdcore-adapter-v2/files/configs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains test configurations that are loaded into the application
diff --git a/sdcore-adapter-v2/templates/_helpers.tpl b/sdcore-adapter-v2/templates/_helpers.tpl
index e7d9bab..7eea561 100644
--- a/sdcore-adapter-v2/templates/_helpers.tpl
+++ b/sdcore-adapter-v2/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/sdcore-adapter-v2/templates/configmap.yaml b/sdcore-adapter-v2/templates/configmap.yaml
index 057871f..2401af4 100644
--- a/sdcore-adapter-v2/templates/configmap.yaml
+++ b/sdcore-adapter-v2/templates/configmap.yaml
@@ -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
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/sdcore-adapter-v2/templates/deployment.yaml b/sdcore-adapter-v2/templates/deployment.yaml
index 2f52b53..f74c8b1 100644
--- a/sdcore-adapter-v2/templates/deployment.yaml
+++ b/sdcore-adapter-v2/templates/deployment.yaml
@@ -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
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/sdcore-adapter-v2/templates/secret.yaml b/sdcore-adapter-v2/templates/secret.yaml
index f54e403..5b77971 100644
--- a/sdcore-adapter-v2/templates/secret.yaml
+++ b/sdcore-adapter-v2/templates/secret.yaml
@@ -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
 
 apiVersion: v1
 kind: Secret
diff --git a/sdcore-adapter-v2/templates/service.yaml b/sdcore-adapter-v2/templates/service.yaml
index 42aa78a..6f29b9a 100644
--- a/sdcore-adapter-v2/templates/service.yaml
+++ b/sdcore-adapter-v2/templates/service.yaml
@@ -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
 
 apiVersion: v1
 kind: Service
diff --git a/sdcore-adapter-v2/templates/servicemonitor.yaml b/sdcore-adapter-v2/templates/servicemonitor.yaml
index f3d9c89..7b42752 100644
--- a/sdcore-adapter-v2/templates/servicemonitor.yaml
+++ b/sdcore-adapter-v2/templates/servicemonitor.yaml
@@ -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
 
 {{- if eq .Values.prometheusEnabled true }}
 
diff --git a/sdcore-adapter-v2/values.yaml b/sdcore-adapter-v2/values.yaml
index 0c4d739..6e98c9e 100644
--- a/sdcore-adapter-v2/values.yaml
+++ b/sdcore-adapter-v2/values.yaml
@@ -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
 
 nameOverride: ""
 fullnameOverride: "sdcore-adapter-v2"
diff --git a/sdcore-adapter-v4/.helmignore b/sdcore-adapter-v4/.helmignore
index 01d4cd9..862263b 100644
--- a/sdcore-adapter-v4/.helmignore
+++ b/sdcore-adapter-v4/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/sdcore-adapter-v4/Chart.yaml b/sdcore-adapter-v4/Chart.yaml
index 6278767..1d64831 100644
--- a/sdcore-adapter-v4/Chart.yaml
+++ b/sdcore-adapter-v4/Chart.yaml
@@ -1,12 +1,12 @@
 # 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
 
 apiVersion: v2
 name: sdcore-adapter-v4
 kubeVersion: ">=1.17.0"
 type: application
-version: 4.0.18
+version: 4.0.19
 appVersion: v4.0.0
 description: Aether SD-Core Adapter
 keywords:
diff --git a/sdcore-adapter-v4/README.md b/sdcore-adapter-v4/README.md
index c589608..15c003f 100644
--- a/sdcore-adapter-v4/README.md
+++ b/sdcore-adapter-v4/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## ONOS SD-Core Adapter
diff --git a/sdcore-adapter-v4/files/certs/README.md b/sdcore-adapter-v4/files/certs/README.md
index ae3f841..a35616f 100644
--- a/sdcore-adapter-v4/files/certs/README.md
+++ b/sdcore-adapter-v4/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/sdcore-adapter-v4/files/configs/README.md b/sdcore-adapter-v4/files/configs/README.md
index cade213..85a3e3c 100644
--- a/sdcore-adapter-v4/files/configs/README.md
+++ b/sdcore-adapter-v4/files/configs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains test configurations that are loaded into the application
diff --git a/sdcore-adapter-v4/templates/_helpers.tpl b/sdcore-adapter-v4/templates/_helpers.tpl
index e7d9bab..7eea561 100644
--- a/sdcore-adapter-v4/templates/_helpers.tpl
+++ b/sdcore-adapter-v4/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/sdcore-adapter-v4/templates/configmap.yaml b/sdcore-adapter-v4/templates/configmap.yaml
index 057871f..2401af4 100644
--- a/sdcore-adapter-v4/templates/configmap.yaml
+++ b/sdcore-adapter-v4/templates/configmap.yaml
@@ -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
 
 apiVersion: v1
 kind: ConfigMap
diff --git a/sdcore-adapter-v4/templates/deployment.yaml b/sdcore-adapter-v4/templates/deployment.yaml
index 2f52b53..f74c8b1 100644
--- a/sdcore-adapter-v4/templates/deployment.yaml
+++ b/sdcore-adapter-v4/templates/deployment.yaml
@@ -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
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/sdcore-adapter-v4/templates/secret.yaml b/sdcore-adapter-v4/templates/secret.yaml
index f54e403..5b77971 100644
--- a/sdcore-adapter-v4/templates/secret.yaml
+++ b/sdcore-adapter-v4/templates/secret.yaml
@@ -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
 
 apiVersion: v1
 kind: Secret
diff --git a/sdcore-adapter-v4/templates/service.yaml b/sdcore-adapter-v4/templates/service.yaml
index 42aa78a..6f29b9a 100644
--- a/sdcore-adapter-v4/templates/service.yaml
+++ b/sdcore-adapter-v4/templates/service.yaml
@@ -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
 
 apiVersion: v1
 kind: Service
diff --git a/sdcore-adapter-v4/templates/servicemonitor.yaml b/sdcore-adapter-v4/templates/servicemonitor.yaml
index f3d9c89..7b42752 100644
--- a/sdcore-adapter-v4/templates/servicemonitor.yaml
+++ b/sdcore-adapter-v4/templates/servicemonitor.yaml
@@ -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
 
 {{- if eq .Values.prometheusEnabled true }}
 
diff --git a/sdcore-adapter-v4/values.yaml b/sdcore-adapter-v4/values.yaml
index adf1acb..3e1b386 100644
--- a/sdcore-adapter-v4/values.yaml
+++ b/sdcore-adapter-v4/values.yaml
@@ -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
 
 nameOverride: ""
 fullnameOverride: "sdcore-adapter-v4"
diff --git a/subscriber-proxy/.helmignore b/subscriber-proxy/.helmignore
index 01d4cd9..862263b 100644
--- a/subscriber-proxy/.helmignore
+++ b/subscriber-proxy/.helmignore
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation
 #
-# 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/subscriber-proxy/Chart.yaml b/subscriber-proxy/Chart.yaml
index f4086e7..ad8587c 100644
--- a/subscriber-proxy/Chart.yaml
+++ b/subscriber-proxy/Chart.yaml
@@ -1,12 +1,12 @@
 # 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
 
 apiVersion: v2
 name: subscriber-proxy
 kubeVersion: ">=1.17.0"
 type: application
-version: 0.1.1
+version: 0.1.2
 appVersion: v0.2.22
 description: Subscriber-Proxy
 keywords:
diff --git a/subscriber-proxy/README.md b/subscriber-proxy/README.md
index 0ce0da9..9355b32 100644
--- a/subscriber-proxy/README.md
+++ b/subscriber-proxy/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 ## ONOS SD-Core Adapter
diff --git a/subscriber-proxy/files/certs/README.md b/subscriber-proxy/files/certs/README.md
index 54b62ae..c7dba99 100644
--- a/subscriber-proxy/files/certs/README.md
+++ b/subscriber-proxy/files/certs/README.md
@@ -1,7 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2021 Open Networking Foundation
 
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+SPDX-License-Identifier: Apache-2.0
 -->
 
 This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
diff --git a/subscriber-proxy/templates/_helpers.tpl b/subscriber-proxy/templates/_helpers.tpl
index 6f324dd..e8fd9da 100644
--- a/subscriber-proxy/templates/_helpers.tpl
+++ b/subscriber-proxy/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
 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
 
 Expand the name of the chart.
 */}}
diff --git a/subscriber-proxy/templates/configmap.yaml b/subscriber-proxy/templates/configmap.yaml
index e1d59c2..ffe5fcb 100644
--- a/subscriber-proxy/templates/configmap.yaml
+++ b/subscriber-proxy/templates/configmap.yaml
@@ -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
 
 
 ---
diff --git a/subscriber-proxy/templates/deployment.yaml b/subscriber-proxy/templates/deployment.yaml
index b18e635..2c2d346 100644
--- a/subscriber-proxy/templates/deployment.yaml
+++ b/subscriber-proxy/templates/deployment.yaml
@@ -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
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/subscriber-proxy/templates/role.yaml b/subscriber-proxy/templates/role.yaml
index 19aa2b4..09197f3 100644
--- a/subscriber-proxy/templates/role.yaml
+++ b/subscriber-proxy/templates/role.yaml
@@ -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
 
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/subscriber-proxy/templates/rolebinding.yaml b/subscriber-proxy/templates/rolebinding.yaml
index f325597..ebbf53b 100644
--- a/subscriber-proxy/templates/rolebinding.yaml
+++ b/subscriber-proxy/templates/rolebinding.yaml
@@ -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
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
diff --git a/subscriber-proxy/templates/secret.yaml b/subscriber-proxy/templates/secret.yaml
index 73cc3fe..9260a14 100644
--- a/subscriber-proxy/templates/secret.yaml
+++ b/subscriber-proxy/templates/secret.yaml
@@ -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
 
 apiVersion: v1
 kind: Secret
diff --git a/subscriber-proxy/templates/service.yaml b/subscriber-proxy/templates/service.yaml
index 409d289..204105f 100644
--- a/subscriber-proxy/templates/service.yaml
+++ b/subscriber-proxy/templates/service.yaml
@@ -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
 
 ---
 apiVersion: v1
diff --git a/subscriber-proxy/templates/serviceaccount.yaml b/subscriber-proxy/templates/serviceaccount.yaml
index 726cfd7..d3ba75b 100644
--- a/subscriber-proxy/templates/serviceaccount.yaml
+++ b/subscriber-proxy/templates/serviceaccount.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 ---
 apiVersion: v1
diff --git a/subscriber-proxy/values.yaml b/subscriber-proxy/values.yaml
index 9398ec8..22ed275 100644
--- a/subscriber-proxy/values.yaml
+++ b/subscriber-proxy/values.yaml
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
 #
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# SPDX-License-Identifier: Apache-2.0
 
 nameOverride: ""
 fullnameOverride: ""
diff --git a/test/main.go b/test/main.go
index 4c0e3a8..379d085 100644
--- a/test/main.go
+++ b/test/main.go
@@ -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
 
 package main