[COMMON] Bump ONAP version

Use version 9.0.0 for Istanbul
Also update the doc.

Issue-ID: OOM-1
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I03e11799bf487226784c98b04116f005c89d1e70
diff --git a/kubernetes/a1policymanagement/Chart.yaml b/kubernetes/a1policymanagement/Chart.yaml
index 919cca8..6d0049e 100644
--- a/kubernetes/a1policymanagement/Chart.yaml
+++ b/kubernetes/a1policymanagement/Chart.yaml
@@ -1,5 +1,6 @@
 ################################################################################
 #   Copyright (c) 2020 Nordix Foundation.                                      #
+#   Modifications Copyright © 2021 Orange                                      #
 #                                                                              #
 #   Licensed under the Apache License, Version 2.0 (the "License");            #
 #   you may not use this file except in compliance with the License.           #
@@ -18,4 +19,4 @@
 appVersion: "1.0.0"
 description: A Helm chart for A1 Policy Management Service
 name: a1policymanagement
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/a1policymanagement/requirements.yaml b/kubernetes/a1policymanagement/requirements.yaml
index 401f2e3..12a8b12 100644
--- a/kubernetes/a1policymanagement/requirements.yaml
+++ b/kubernetes/a1policymanagement/requirements.yaml
@@ -1,5 +1,6 @@
 ################################################################################
 #   Copyright (c) 2020 Nordix Foundation.                                      #
+#   Modifications Copyright © 2021 Orange                                      #
 #                                                                              #
 #   Licensed under the Apache License, Version 2.0 (the "License");            #
 #   you may not use this file except in compliance with the License.           #
@@ -16,14 +17,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml
index 25d921e..0a4168b 100644
--- a/kubernetes/aaf/Chart.yaml
+++ b/kubernetes/aaf/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018 ZTE
 # Modifications Copyright © 2018 AT&T, Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Application Authorization Framework
 name: aaf
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-cass/Chart.yaml b/kubernetes/aaf/components/aaf-cass/Chart.yaml
index a3be84f..ab6858c 100644
--- a/kubernetes/aaf/components/aaf-cass/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cass/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAF cassandra
 name: aaf-cass
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-cass/requirements.yaml b/kubernetes/aaf/components/aaf-cass/requirements.yaml
index e89dc58..ac7f3c6 100644
--- a/kubernetes/aaf/components/aaf-cass/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-cass/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-cm/Chart.yaml b/kubernetes/aaf/components/aaf-cm/Chart.yaml
index f5fd4ea..8d0566e 100644
--- a/kubernetes/aaf/components/aaf-cm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cm/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP AAF Certificate Manager
 name: aaf-cm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-cm/requirements.yaml b/kubernetes/aaf/components/aaf-cm/requirements.yaml
index 5715c23..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-cm/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-cm/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-fs/Chart.yaml b/kubernetes/aaf/components/aaf-fs/Chart.yaml
index fc1f072..28c05e7 100644
--- a/kubernetes/aaf/components/aaf-fs/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-fs/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAF File Server
 name: aaf-fs
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-fs/requirements.yaml b/kubernetes/aaf/components/aaf-fs/requirements.yaml
index 5715c23..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-fs/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-fs/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-gui/Chart.yaml b/kubernetes/aaf/components/aaf-gui/Chart.yaml
index cea5634..81a51e6 100644
--- a/kubernetes/aaf/components/aaf-gui/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-gui/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAF GUI
 name: aaf-gui
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-gui/requirements.yaml b/kubernetes/aaf/components/aaf-gui/requirements.yaml
index 4e6c3e6..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-gui/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-gui/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-hello/Chart.yaml b/kubernetes/aaf/components/aaf-hello/Chart.yaml
index 66bf3c0..8724914 100644
--- a/kubernetes/aaf/components/aaf-hello/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-hello/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAF Hello
 name: aaf-hello
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-hello/requirements.yaml b/kubernetes/aaf/components/aaf-hello/requirements.yaml
index 4e6c3e6..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-hello/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-hello/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-locate/Chart.yaml b/kubernetes/aaf/components/aaf-locate/Chart.yaml
index ef8928c..947284d 100644
--- a/kubernetes/aaf/components/aaf-locate/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-locate/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAF Locate
 name: aaf-locate
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-locate/requirements.yaml b/kubernetes/aaf/components/aaf-locate/requirements.yaml
index 4e6c3e6..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-locate/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-locate/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-oauth/Chart.yaml b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
index 4b93d5f..3c48c63 100644
--- a/kubernetes/aaf/components/aaf-oauth/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAF OAuth
 name: aaf-oauth
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-oauth/requirements.yaml b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
index 4e6c3e6..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-oauth/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-service/Chart.yaml b/kubernetes/aaf/components/aaf-service/Chart.yaml
index a533f56..33df46f 100644
--- a/kubernetes/aaf/components/aaf-service/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-service/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAF Service
 name: aaf-service
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-service/requirements.yaml b/kubernetes/aaf/components/aaf-service/requirements.yaml
index 4e6c3e6..5086cc9 100644
--- a/kubernetes/aaf/components/aaf-service/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-service/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-sms/Chart.yaml b/kubernetes/aaf/components/aaf-sms/Chart.yaml
index df5240f..3e315fb 100644
--- a/kubernetes/aaf/components/aaf-sms/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Secret Management Service
 name: aaf-sms
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
index 5eef273..2b87957 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Secret Management Service Quorum Client
 name: aaf-sms-quorumclient
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
index e89dc58..ac7f3c6 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
index 77e6d12..b05165e 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 description: Chart to launch Vault as SMS backend
 name: aaf-sms-vault
 appVersion: 0.9.5
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
index e89dc58..ac7f3c6 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/requirements.yaml b/kubernetes/aaf/components/aaf-sms/requirements.yaml
index 1876fda..0cbd2a2 100644
--- a/kubernetes/aaf/components/aaf-sms/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sms/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: aaf-sms-quorumclient
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-sms-quorumclient'
   - name: aaf-sms-vault
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-sms-vault'
diff --git a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
index 157262b..9bf0e7b 100644
--- a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Hardware Security Components
 name: aaf-sshsm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
index 63217a2..4908c68 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Trusted Platform Module Resource Manager
 name: aaf-sshsm-abrmd
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
index 594b12d..96c6cdd 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
index 311130e..d237c7b 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Trusted Platform Module Distribution Center
 name: aaf-sshsm-distcenter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
index 594b12d..96c6cdd 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
index a50d95f..baa354e 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Trusted Platform Module Test CA Service
 name: aaf-sshsm-testca
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
index 594b12d..96c6cdd 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
index 134666d..e39cac8 100644
--- a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: aaf-sshsm-abrmd
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-sshsm-abrmd'
     condition: aaf-sshsm-abrmd.enabled
   - name: aaf-sshsm-distcenter
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-sshsm-distcenter'
     condition: aaf-sshsm-distcenter.enabled
   - name: aaf-sshsm-testca
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-sshsm-testca'
     condition: aaf-sshsm-testca.testca.enabled
diff --git a/kubernetes/aaf/components/aaf-templates/Chart.yaml b/kubernetes/aaf/components/aaf-templates/Chart.yaml
index f87e6b8..708def6 100644
--- a/kubernetes/aaf/components/aaf-templates/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-templates/Chart.yaml
@@ -1,5 +1,4 @@
-# Copyright © 2020 Orange
-# Modifications Copyright © 2018 AT&T, Amdocs, Bell Canada
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +15,4 @@
 apiVersion: v1
 description: ONAP Application Authorization Framework Templates
 name: aaf-templates
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aaf/components/aaf-templates/requirements.yaml b/kubernetes/aaf/components/aaf-templates/requirements.yaml
index cead078..392fda1 100644
--- a/kubernetes/aaf/components/aaf-templates/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-templates/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/requirements.yaml b/kubernetes/aaf/requirements.yaml
index e5dd29a..2bf9b28 100644
--- a/kubernetes/aaf/requirements.yaml
+++ b/kubernetes/aaf/requirements.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
 # Modifications Copyright © 2020 Nokia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,42 +17,42 @@
 
 dependencies:
   - name: aaf-cass
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-cass'
     condition: aaf-authz.enabled
   - name: aaf-cm
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-cm'
     condition: aaf-authz.enabled
   - name: aaf-fs
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-fs'
     condition: aaf-authz.enabled
   - name: aaf-gui
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-gui'
     condition: aaf-authz.enabled
   - name: aaf-hello
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-hello'
     condition: aaf-hello.enabled
   - name: aaf-locate
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-locate'
     condition: aaf-authz.enabled
   - name: aaf-oauth
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-oauth'
     condition: aaf-authz.enabled
   - name: aaf-service
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-service'
     condition: aaf-authz.enabled
   - name: aaf-sms
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-sms'
     condition: aaf-sms.enabled
   - name: aaf-sshsm
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aaf-sshsm'
     condition: aaf-sshsm.enabled
diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index 5d59ef5..8cb1846 100644
--- a/kubernetes/aai/Chart.yaml
+++ b/kubernetes/aai/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Active and Available Inventory
 name: aai
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-babel/Chart.yaml b/kubernetes/aai/components/aai-babel/Chart.yaml
index 8f6c923..f9212fa 100644
--- a/kubernetes/aai/components/aai-babel/Chart.yaml
+++ b/kubernetes/aai/components/aai-babel/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: Babel microservice
 name: aai-babel
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-babel/requirements.yaml b/kubernetes/aai/components/aai-babel/requirements.yaml
index 1f3e924..a725a4e 100644
--- a/kubernetes/aai/components/aai-babel/requirements.yaml
+++ b/kubernetes/aai/components/aai-babel/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aai/components/aai-graphadmin/Chart.yaml b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
index 911e989..4ccf89d 100644
--- a/kubernetes/aai/components/aai-graphadmin/Chart.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
@@ -3,6 +3,7 @@
 # org.onap.aai
 # ================================================================================
 # Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,4 +21,4 @@
 apiVersion: v1
 description: ONAP AAI GraphAdmin
 name: aai-graphadmin
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-graphadmin/requirements.yaml b/kubernetes/aai/components/aai-graphadmin/requirements.yaml
index 3d0f24c..d80dc5a 100644
--- a/kubernetes/aai/components/aai-graphadmin/requirements.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/requirements.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aai/components/aai-modelloader/Chart.yaml b/kubernetes/aai/components/aai-modelloader/Chart.yaml
index 74b2912..31bf1bb 100644
--- a/kubernetes/aai/components/aai-modelloader/Chart.yaml
+++ b/kubernetes/aai/components/aai-modelloader/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAI modelloader
 name: aai-modelloader
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-modelloader/requirements.yaml b/kubernetes/aai/components/aai-modelloader/requirements.yaml
index 3d0f24c..d80dc5a 100644
--- a/kubernetes/aai/components/aai-modelloader/requirements.yaml
+++ b/kubernetes/aai/components/aai-modelloader/requirements.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aai/components/aai-resources/Chart.yaml b/kubernetes/aai/components/aai-resources/Chart.yaml
index 62e8c81..50bf63a 100644
--- a/kubernetes/aai/components/aai-resources/Chart.yaml
+++ b/kubernetes/aai/components/aai-resources/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP AAI resources
 name: aai-resources
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-resources/requirements.yaml b/kubernetes/aai/components/aai-resources/requirements.yaml
index 1552d53..5a41aef 100644
--- a/kubernetes/aai/components/aai-resources/requirements.yaml
+++ b/kubernetes/aai/components/aai-resources/requirements.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aai/components/aai-schema-service/Chart.yaml b/kubernetes/aai/components/aai-schema-service/Chart.yaml
index c27ac5e..6dd8262 100644
--- a/kubernetes/aai/components/aai-schema-service/Chart.yaml
+++ b/kubernetes/aai/components/aai-schema-service/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2019 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP AAI Schema Service
 name: aai-schema-service
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-schema-service/requirements.yaml b/kubernetes/aai/components/aai-schema-service/requirements.yaml
index 3d0f24c..d80dc5a 100644
--- a/kubernetes/aai/components/aai-schema-service/requirements.yaml
+++ b/kubernetes/aai/components/aai-schema-service/requirements.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aai/components/aai-sparky-be/Chart.yaml b/kubernetes/aai/components/aai-sparky-be/Chart.yaml
index a9ba0b2..66ac891 100644
--- a/kubernetes/aai/components/aai-sparky-be/Chart.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAI sparky-be
 name: aai-sparky-be
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-sparky-be/requirements.yaml b/kubernetes/aai/components/aai-sparky-be/requirements.yaml
index 1552d53..5a41aef 100644
--- a/kubernetes/aai/components/aai-sparky-be/requirements.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/requirements.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aai/components/aai-traversal/Chart.yaml b/kubernetes/aai/components/aai-traversal/Chart.yaml
index c21bf1b..b4acc59 100644
--- a/kubernetes/aai/components/aai-traversal/Chart.yaml
+++ b/kubernetes/aai/components/aai-traversal/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAI traversal
 name: aai-traversal
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/aai/components/aai-traversal/requirements.yaml b/kubernetes/aai/components/aai-traversal/requirements.yaml
index 1552d53..5a41aef 100644
--- a/kubernetes/aai/components/aai-traversal/requirements.yaml
+++ b/kubernetes/aai/components/aai-traversal/requirements.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2018 Amdocs, AT&T
 # Modifications Copyright © 2018 Bell Canada
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/aai/requirements.yaml b/kubernetes/aai/requirements.yaml
index 1984399..c3c702e 100644
--- a/kubernetes/aai/requirements.yaml
+++ b/kubernetes/aai/requirements.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,52 +16,52 @@
 ---
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: cassandra
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
     condition: global.cassandra.localCluster
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: aai-babel
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aai-babel'
     condition: aai-babel.enabled
   - name: aai-graphadmin
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aai-graphadmin'
     condition: aai-graphadmin.enabled
   - name: aai-modelloader
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aai-modelloader'
     condition: aai-modelloader.enabled
   - name: aai-resources
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aai-resources'
     condition: aai-resources.enabled
   - name: aai-schema-service
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aai-schema-service'
     condition: aai-schema-service.enabled
   - name: aai-sparky-be
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aai-sparky-be'
     condition: aai-sparky-be.enabled
   - name: aai-traversal
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/aai-traversal'
     condition: aai-traversal.enabled
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml
index 468f564..99b8388 100644
--- a/kubernetes/appc/Chart.yaml
+++ b/kubernetes/appc/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: Application Controller
 name: appc
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/appc/components/appc-ansible-server/Chart.yaml b/kubernetes/appc/components/appc-ansible-server/Chart.yaml
index 95615ce..6896de0 100644
--- a/kubernetes/appc/components/appc-ansible-server/Chart.yaml
+++ b/kubernetes/appc/components/appc-ansible-server/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP APPC Ansible Server
 name: appc-ansible-server
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/appc/components/appc-ansible-server/requirements.yaml b/kubernetes/appc/components/appc-ansible-server/requirements.yaml
index 5b6288a..0cbc506 100644
--- a/kubernetes/appc/components/appc-ansible-server/requirements.yaml
+++ b/kubernetes/appc/components/appc-ansible-server/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/appc/components/appc-cdt/Chart.yaml b/kubernetes/appc/components/appc-cdt/Chart.yaml
index 7f29f2a..e8e4177 100644
--- a/kubernetes/appc/components/appc-cdt/Chart.yaml
+++ b/kubernetes/appc/components/appc-cdt/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP APPC Self Service Controller Design Tool
 name: appc-cdt
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/appc/components/appc-cdt/requirements.yaml b/kubernetes/appc/components/appc-cdt/requirements.yaml
index 7ce274a..517e284 100644
--- a/kubernetes/appc/components/appc-cdt/requirements.yaml
+++ b/kubernetes/appc/components/appc-cdt/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/appc/requirements.yaml b/kubernetes/appc/requirements.yaml
index b4960c2..886e216 100644
--- a/kubernetes/appc/requirements.yaml
+++ b/kubernetes/appc/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dgbuilder
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: appc-ansible-server
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/appc-ansible-server'
     condition: appc-ansible-server.enabled
   - name: appc-cdt
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/appc-cdt'
     condition: appc-cdt.enabled
diff --git a/kubernetes/cds/Chart.yaml b/kubernetes/cds/Chart.yaml
index 09955ed..f2f6cc5 100644
--- a/kubernetes/cds/Chart.yaml
+++ b/kubernetes/cds/Chart.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018  Orange
+# Modifications Copyright © 2018-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Controller Design Studio (CDS)
 name: cds
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
index 0026707..18c18b6 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2019 IBM, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP CDS Blueprints Processor
 name: cds-blueprints-processor
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
index baf1a76..84fa9c4 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2019 IBM, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,15 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
-
diff --git a/kubernetes/cds/components/cds-command-executor/Chart.yaml b/kubernetes/cds/components/cds-command-executor/Chart.yaml
index a2659f4..8d0e5f3 100755
--- a/kubernetes/cds/components/cds-command-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-command-executor/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP CDS Command Executor
 name: cds-command-executor
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-command-executor/requirements.yaml b/kubernetes/cds/components/cds-command-executor/requirements.yaml
index 96ce828..59ed004 100755
--- a/kubernetes/cds/components/cds-command-executor/requirements.yaml
+++ b/kubernetes/cds/components/cds-command-executor/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/cds/components/cds-py-executor/Chart.yaml b/kubernetes/cds/components/cds-py-executor/Chart.yaml
index e4d1453..d0bfc51 100755
--- a/kubernetes/cds/components/cds-py-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-py-executor/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2020 Bell Canada, Deutsche Telekom
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP CDS Py Executor
 name: cds-py-executor
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-py-executor/requirements.yaml b/kubernetes/cds/components/cds-py-executor/requirements.yaml
index 6b7064c..331a2a4 100755
--- a/kubernetes/cds/components/cds-py-executor/requirements.yaml
+++ b/kubernetes/cds/components/cds-py-executor/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2020 Bell Canada, Deutsche Telekom
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
index 9f524b2..8897062 100755
--- a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP CDS SDC listener microservice
 name: cds-sdc-listener
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
index 96ce828..59ed004 100755
--- a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/cds/components/cds-ui/Chart.yaml b/kubernetes/cds/components/cds-ui/Chart.yaml
index 1fb0dd5..5d40e2b 100644
--- a/kubernetes/cds/components/cds-ui/Chart.yaml
+++ b/kubernetes/cds/components/cds-ui/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP CDS UI
 name: cds-ui
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cds/components/cds-ui/requirements.yaml b/kubernetes/cds/components/cds-ui/requirements.yaml
index 8f6d158..fec1da9 100644
--- a/kubernetes/cds/components/cds-ui/requirements.yaml
+++ b/kubernetes/cds/components/cds-ui/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml
index 58ae5a0..c5c05bb 100644
--- a/kubernetes/cds/requirements.yaml
+++ b/kubernetes/cds/requirements.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 Orange
+# Modifications Copyright © 2018,2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,28 +15,28 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: cds-blueprints-processor
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/cds-blueprints-processor'
     condition: cds-blueprints-processor.enabled
   - name: cds-command-executor
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/cds-command-executor'
     condition: cds-command-executor.enabled
   - name: cds-py-executor
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/cds-py-executor'
     condition: cds-py-executor.enabled
   - name: cds-sdc-listener
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/cds-sdc-listener'
     condition: cds-sdc-listener.enabled
   - name: cds-ui
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/cds-ui'
     condition: cds-ui.enabled
diff --git a/kubernetes/cli/Chart.yaml b/kubernetes/cli/Chart.yaml
index 469cb6d..b6c6b16 100644
--- a/kubernetes/cli/Chart.yaml
+++ b/kubernetes/cli/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Command Line Interface
 name: cli
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cli/requirements.yaml b/kubernetes/cli/requirements.yaml
index 2394a67..4f79257 100644
--- a/kubernetes/cli/requirements.yaml
+++ b/kubernetes/cli/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml
index 573e7d9..ea00e39 100644
--- a/kubernetes/common/cassandra/Chart.yaml
+++ b/kubernetes/common/cassandra/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP cassandra
 name: cassandra
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/cassandra/requirements.yaml b/kubernetes/common/cassandra/requirements.yaml
index f2860ff..4189d43 100644
--- a/kubernetes/common/cassandra/requirements.yaml
+++ b/kubernetes/common/cassandra/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/cert-wrapper/Chart.yaml b/kubernetes/common/cert-wrapper/Chart.yaml
index ef18eaa..242bb46 100644
--- a/kubernetes/common/cert-wrapper/Chart.yaml
+++ b/kubernetes/common/cert-wrapper/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Wrapper chart to allow truststore to be shared among cert-initializer instances
 name: cert-wrapper
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/cert-wrapper/requirements.yaml b/kubernetes/common/cert-wrapper/requirements.yaml
index 744d81f..08cf530 100644
--- a/kubernetes/common/cert-wrapper/requirements.yaml
+++ b/kubernetes/common/cert-wrapper/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
 
 dependencies:
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../certInitializer'
diff --git a/kubernetes/common/certInitializer/Chart.yaml b/kubernetes/common/certInitializer/Chart.yaml
index 371023b..0ed89d4 100644
--- a/kubernetes/common/certInitializer/Chart.yaml
+++ b/kubernetes/common/certInitializer/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Template used to obtain certificates in onap
 name: certInitializer
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/certInitializer/requirements.yaml b/kubernetes/common/certInitializer/requirements.yaml
index 78775ae..96b54cd 100644
--- a/kubernetes/common/certInitializer/requirements.yaml
+++ b/kubernetes/common/certInitializer/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../readinessCheck'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/certManagerCertificate/Chart.yaml b/kubernetes/common/certManagerCertificate/Chart.yaml
index 8c0113b..84b9670 100644
--- a/kubernetes/common/certManagerCertificate/Chart.yaml
+++ b/kubernetes/common/certManagerCertificate/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2021 Nokia
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 name: certManagerCertificate
 description: A Helm chart for Cert-Manager Certificate CRD template
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/certManagerCertificate/requirements.yaml b/kubernetes/common/certManagerCertificate/requirements.yaml
index 83becb0..42420ce 100644
--- a/kubernetes/common/certManagerCertificate/requirements.yaml
+++ b/kubernetes/common/certManagerCertificate/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2021 Nokia
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: cmpv2Config
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../cmpv2Config'
diff --git a/kubernetes/common/cmpv2Config/Chart.yaml b/kubernetes/common/cmpv2Config/Chart.yaml
index bac8276..fb1c2d2 100644
--- a/kubernetes/common/cmpv2Config/Chart.yaml
+++ b/kubernetes/common/cmpv2Config/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Template used to store cmpv2 configuration in onap
 name: cmpv2Config
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/cmpv2Config/requirements.yaml b/kubernetes/common/cmpv2Config/requirements.yaml
index 5a100d3..f5c9d0c 100644
--- a/kubernetes/common/cmpv2Config/requirements.yaml
+++ b/kubernetes/common/cmpv2Config/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index f184cb9..1307a8a 100644
--- a/kubernetes/common/common/Chart.yaml
+++ b/kubernetes/common/common/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Common templates for inclusion in other charts
 name: common
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml
index 0f2b546..8f56294 100644
--- a/kubernetes/common/dgbuilder/Chart.yaml
+++ b/kubernetes/common/dgbuilder/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 AT&T, Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: D.G. Builder application
 name: dgbuilder
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/dgbuilder/requirements.yaml b/kubernetes/common/dgbuilder/requirements.yaml
index 1bbab11..5e56fe7 100644
--- a/kubernetes/common/dgbuilder/requirements.yaml
+++ b/kubernetes/common/dgbuilder/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 AT&T, Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/elasticsearch/Chart.yaml b/kubernetes/common/elasticsearch/Chart.yaml
index 494aaf0..225e6c3 100644
--- a/kubernetes/common/elasticsearch/Chart.yaml
+++ b/kubernetes/common/elasticsearch/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP elasticsearch
 name: elasticsearch
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/elasticsearch/components/curator/Chart.yaml b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
index d113870..1e51fec 100644
--- a/kubernetes/common/elasticsearch/components/curator/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP elasticsearch curator
 name: curator
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/elasticsearch/components/curator/requirements.yaml b/kubernetes/common/elasticsearch/components/curator/requirements.yaml
index d7bac0b..e917076 100644
--- a/kubernetes/common/elasticsearch/components/curator/requirements.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/data/Chart.yaml b/kubernetes/common/elasticsearch/components/data/Chart.yaml
index 65251f6..2218bef 100644
--- a/kubernetes/common/elasticsearch/components/data/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/data/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP elasticsearch data
 name: data
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/elasticsearch/components/data/requirements.yaml b/kubernetes/common/elasticsearch/components/data/requirements.yaml
index 3a52cbe..6212efa 100644
--- a/kubernetes/common/elasticsearch/components/data/requirements.yaml
+++ b/kubernetes/common/elasticsearch/components/data/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/master/Chart.yaml b/kubernetes/common/elasticsearch/components/master/Chart.yaml
index f3fa699..49ed5d0 100644
--- a/kubernetes/common/elasticsearch/components/master/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/master/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,4 +18,4 @@
 apiVersion: v1
 description: ONAP elasticsearch master
 name: master
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/elasticsearch/components/master/requirements.yaml b/kubernetes/common/elasticsearch/components/master/requirements.yaml
index 3a52cbe..6212efa 100644
--- a/kubernetes/common/elasticsearch/components/master/requirements.yaml
+++ b/kubernetes/common/elasticsearch/components/master/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/requirements.yaml b/kubernetes/common/elasticsearch/requirements.yaml
index e252569..c41b360 100644
--- a/kubernetes/common/elasticsearch/requirements.yaml
+++ b/kubernetes/common/elasticsearch/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: master
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/master'
   - name: data
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/data'
     condition: elasticsearch.data.enabled,data.enabled
   - name: curator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/curator'
     condition: elasticsearch.curator.enabled,curator.enabled
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../certInitializer'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/etcd-init/Chart.yaml b/kubernetes/common/etcd-init/Chart.yaml
index 20f5ac4..065d3da 100644
--- a/kubernetes/common/etcd-init/Chart.yaml
+++ b/kubernetes/common/etcd-init/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Chart for etcd init job
 name: etcd-init
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/etcd-init/requirements.yaml b/kubernetes/common/etcd-init/requirements.yaml
index 008789b..a8c99d6 100644
--- a/kubernetes/common/etcd-init/requirements.yaml
+++ b/kubernetes/common/etcd-init/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml
index 72d7bdb..1e09089 100644
--- a/kubernetes/common/etcd/Chart.yaml
+++ b/kubernetes/common/etcd/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2019 Intel Corporation
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +16,7 @@
 apiVersion: v1
 name: etcd
 home: https://github.com/coreos/etcd
-version: 8.0.0
+version: 9.0.0
 appVersion: 2.2.5
 description: Distributed reliable key-value store for the most critical data of a
   distributed system.
diff --git a/kubernetes/common/etcd/requirements.yaml b/kubernetes/common/etcd/requirements.yaml
index da0ef74..48ff493 100644
--- a/kubernetes/common/etcd/requirements.yaml
+++ b/kubernetes/common/etcd/requirements.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 Orange
+# Modifications Copyright © 2018,2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
 # limitations under the License
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/logConfiguration/Chart.yaml b/kubernetes/common/logConfiguration/Chart.yaml
index 1d1678e..1862804 100644
--- a/kubernetes/common/logConfiguration/Chart.yaml
+++ b/kubernetes/common/logConfiguration/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Template used to create same STDOUT log configuration
 name: logConfiguration
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/logConfiguration/requirements.yaml b/kubernetes/common/logConfiguration/requirements.yaml
index 6bd7f98..8af6712 100644
--- a/kubernetes/common/logConfiguration/requirements.yaml
+++ b/kubernetes/common/logConfiguration/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml
index 2905b31..0616951 100644
--- a/kubernetes/common/mariadb-galera/Chart.yaml
+++ b/kubernetes/common/mariadb-galera/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018 Amdocs, Bell Canada
 # Copyright © 2020 Bitnami, Orange
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
 apiVersion: v1
 description: Chart for MariaDB Galera cluster
 name: mariadb-galera
-version: 8.0.0
+version: 9.0.0
 keywords:
   - mariadb
   - mysql
diff --git a/kubernetes/common/mariadb-galera/requirements.yaml b/kubernetes/common/mariadb-galera/requirements.yaml
index cec7a1b..767336e 100644
--- a/kubernetes/common/mariadb-galera/requirements.yaml
+++ b/kubernetes/common/mariadb-galera/requirements.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
-# Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../readinessCheck'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/mariadb-init/Chart.yaml b/kubernetes/common/mariadb-init/Chart.yaml
index 2c679ff..357a683 100644
--- a/kubernetes/common/mariadb-init/Chart.yaml
+++ b/kubernetes/common/mariadb-init/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Chart for MariaDB Galera init job
 name: mariadb-init
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/mariadb-init/requirements.yaml b/kubernetes/common/mariadb-init/requirements.yaml
index 0a1d9f3..da8305e 100644
--- a/kubernetes/common/mariadb-init/requirements.yaml
+++ b/kubernetes/common/mariadb-init/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/mongo/Chart.yaml b/kubernetes/common/mongo/Chart.yaml
index ad35ea0..84e1ea6 100644
--- a/kubernetes/common/mongo/Chart.yaml
+++ b/kubernetes/common/mongo/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2018 Orange
+# Copyright © 2018, 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: MongoDB Server
 name: mongo
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/mongo/requirements.yaml b/kubernetes/common/mongo/requirements.yaml
index ba0feec..c791c85 100644
--- a/kubernetes/common/mongo/requirements.yaml
+++ b/kubernetes/common/mongo/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/music/Chart.yaml b/kubernetes/common/music/Chart.yaml
index 7ba72ef..9ac168e 100644
--- a/kubernetes/common/music/Chart.yaml
+++ b/kubernetes/common/music/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: MUSIC - Multi-site State Coordination Service
 name: music
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/music/components/music-cassandra/Chart.yaml b/kubernetes/common/music/components/music-cassandra/Chart.yaml
index 2e4be22..aa97c71 100644
--- a/kubernetes/common/music/components/music-cassandra/Chart.yaml
+++ b/kubernetes/common/music/components/music-cassandra/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP - Cassandra Database
 name: music-cassandra
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/music/components/music-cassandra/requirements.yaml b/kubernetes/common/music/components/music-cassandra/requirements.yaml
index 4e8a85a..5fa28a7 100644
--- a/kubernetes/common/music/components/music-cassandra/requirements.yaml
+++ b/kubernetes/common/music/components/music-cassandra/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/music/requirements.yaml b/kubernetes/common/music/requirements.yaml
index d16ce06..e65219c 100644
--- a/kubernetes/common/music/requirements.yaml
+++ b/kubernetes/common/music/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
 
 dependencies:
   - name: music-cassandra
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/music-cassandra'
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../certInitializer'
diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml
index 173dd33..3f54927 100644
--- a/kubernetes/common/network-name-gen/Chart.yaml
+++ b/kubernetes/common/network-name-gen/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2018  AT&T Intellectual Property.  All rights reserved.

+# Modifications Copyright © 2021 Orange

 #

 # Licensed under the Apache License, Version 2.0 (the "License");

 # you may not use this file except in compliance with the License.

@@ -15,4 +16,4 @@
 apiVersion: v1

 description: Name Generation Micro Service

 name: network-name-gen

-version: 8.0.0

+version: 9.0.0

diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml
index e543bc6..88b6a3d 100644
--- a/kubernetes/common/network-name-gen/requirements.yaml
+++ b/kubernetes/common/network-name-gen/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2018  AT&T Intellectual Property.  All rights reserved.

+# Modifications Copyright © 2021 Orange

 #

 # Licensed under the Apache License, Version 2.0 (the "License");

 # you may not use this file except in compliance with the License.

@@ -14,16 +15,16 @@
 

 dependencies:

   - name: common

-    version: ~8.x-0

+    version: ~9.x-0

     repository: 'file://../common'

   - name: repositoryGenerator

-    version: ~8.x-0

+    version: ~9.x-0

     repository: 'file://../repositoryGenerator'

   - name: mariadb-galera

-    version: ~8.x-0

+    version: ~9.x-0

     repository: 'file://../mariadb-galera'

     condition: global.mariadbGalera.localCluster

   - name: mariadb-init

-    version: ~8.x-0

+    version: ~9.x-0

     repository: 'file://../mariadb-init'

     condition: not global.mariadbGalera.localCluster

diff --git a/kubernetes/common/postgres-init/Chart.yaml b/kubernetes/common/postgres-init/Chart.yaml
index 7de0d9a..7cf3861 100644
--- a/kubernetes/common/postgres-init/Chart.yaml
+++ b/kubernetes/common/postgres-init/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Chart for Postgres init job
 name: postgres-init
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/postgres-init/requirements.yaml b/kubernetes/common/postgres-init/requirements.yaml
index 1a4ab2f..1bc4675 100644
--- a/kubernetes/common/postgres-init/requirements.yaml
+++ b/kubernetes/common/postgres-init/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml
index 26c55c7..b0759a5 100644
--- a/kubernetes/common/postgres/Chart.yaml
+++ b/kubernetes/common/postgres/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, AT&T, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Postgres Server
 name: postgres
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/postgres/requirements.yaml b/kubernetes/common/postgres/requirements.yaml
index 7d04073..8f1f327 100644
--- a/kubernetes/common/postgres/requirements.yaml
+++ b/kubernetes/common/postgres/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, AT&T, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/readinessCheck/Chart.yaml b/kubernetes/common/readinessCheck/Chart.yaml
index 842dd7d..86aa152 100644
--- a/kubernetes/common/readinessCheck/Chart.yaml
+++ b/kubernetes/common/readinessCheck/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Template used to wait for other deployment/sts/jobs in onap
 name: readinessCheck
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/readinessCheck/requirements.yaml b/kubernetes/common/readinessCheck/requirements.yaml
index 0a1d9f3..da8305e 100644
--- a/kubernetes/common/readinessCheck/requirements.yaml
+++ b/kubernetes/common/readinessCheck/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/repository-wrapper/Chart.yaml b/kubernetes/common/repository-wrapper/Chart.yaml
index 6018f6a..381e451 100644
--- a/kubernetes/common/repository-wrapper/Chart.yaml
+++ b/kubernetes/common/repository-wrapper/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Wrapper chart to allow docker secret to be shared all instances
 name: repository-wrapper
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/repository-wrapper/requirements.yaml b/kubernetes/common/repository-wrapper/requirements.yaml
index 0a1d9f3..da8305e 100644
--- a/kubernetes/common/repository-wrapper/requirements.yaml
+++ b/kubernetes/common/repository-wrapper/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/repositoryGenerator/Chart.yaml b/kubernetes/common/repositoryGenerator/Chart.yaml
index fc10b1b..24d9f59 100644
--- a/kubernetes/common/repositoryGenerator/Chart.yaml
+++ b/kubernetes/common/repositoryGenerator/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Template used to generate the right repository link
 name: repositoryGenerator
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/roles-wrapper/Chart.yaml b/kubernetes/common/roles-wrapper/Chart.yaml
index 862773f..0e4ba0b 100644
--- a/kubernetes/common/roles-wrapper/Chart.yaml
+++ b/kubernetes/common/roles-wrapper/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Wrapper chart to allow default roles to be shared among onap instances
 name: roles-wrapper
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/roles-wrapper/requirements.yaml b/kubernetes/common/roles-wrapper/requirements.yaml
index b2d51ef..102e006 100644
--- a/kubernetes/common/roles-wrapper/requirements.yaml
+++ b/kubernetes/common/roles-wrapper/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
diff --git a/kubernetes/common/serviceAccount/Chart.yaml b/kubernetes/common/serviceAccount/Chart.yaml
index 034e5ee..54ab969 100644
--- a/kubernetes/common/serviceAccount/Chart.yaml
+++ b/kubernetes/common/serviceAccount/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Template used to create the right Service Accounts / Role / RoleBinding
 name: serviceAccount
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/serviceAccount/requirements.yaml b/kubernetes/common/serviceAccount/requirements.yaml
index 6bd7f98..8af6712 100644
--- a/kubernetes/common/serviceAccount/requirements.yaml
+++ b/kubernetes/common/serviceAccount/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../common'
diff --git a/kubernetes/common/timescaledb/Chart.yaml b/kubernetes/common/timescaledb/Chart.yaml
index 7aeafa0..e2e9e7d 100644
--- a/kubernetes/common/timescaledb/Chart.yaml
+++ b/kubernetes/common/timescaledb/Chart.yaml
@@ -1,5 +1,6 @@
 # ============LICENSE_START=======================================================
 #  Copyright (c) 2021 Bell Canada.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,4 +21,4 @@
 appVersion: "1.0"
 description: ONAP timescaledb
 name: timescaledb
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/common/timescaledb/requirements.yaml b/kubernetes/common/timescaledb/requirements.yaml
index de0c414..1bcd103 100644
--- a/kubernetes/common/timescaledb/requirements.yaml
+++ b/kubernetes/common/timescaledb/requirements.yaml
@@ -1,5 +1,6 @@
 # ============LICENSE_START=======================================================
 #  Copyright (c) 2021 Bell Canada.
+#  Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,11 +19,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/consul/Chart.yaml b/kubernetes/consul/Chart.yaml
index 970ab43..19c0182 100644
--- a/kubernetes/consul/Chart.yaml
+++ b/kubernetes/consul/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Consul Agent
 name: consul
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/consul/components/consul-server/Chart.yaml b/kubernetes/consul/components/consul-server/Chart.yaml
index fe5546c..466bbc6 100644
--- a/kubernetes/consul/components/consul-server/Chart.yaml
+++ b/kubernetes/consul/components/consul-server/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Consul Server
 name: consul-server
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/consul/components/consul-server/requirements.yaml b/kubernetes/consul/components/consul-server/requirements.yaml
index e43236d..3ad1b35 100644
--- a/kubernetes/consul/components/consul-server/requirements.yaml
+++ b/kubernetes/consul/components/consul-server/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/consul/requirements.yaml b/kubernetes/consul/requirements.yaml
index 1312294..a0b33cc 100644
--- a/kubernetes/consul/requirements.yaml
+++ b/kubernetes/consul/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,18 +16,18 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: consul-server
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/consul-server'
     condition: consul-server.enabled
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/contrib/Chart.yaml b/kubernetes/contrib/Chart.yaml
index 1ab79d9..2df075a 100755
--- a/kubernetes/contrib/Chart.yaml
+++ b/kubernetes/contrib/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP optional tools
 name: contrib
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/awx/Chart.yaml b/kubernetes/contrib/components/awx/Chart.yaml
index 46a0d18..6b7fb60 100755
--- a/kubernetes/contrib/components/awx/Chart.yaml
+++ b/kubernetes/contrib/components/awx/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,4 +18,4 @@
 name: awx
 sources:
   - https://github.com/ansible/awx
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
index d21f2d4..66bf12e 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Ansible AWX database
 name: awx-postgres
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
index b7c4d1e..eae0750 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/contrib/components/awx/requirements.yaml b/kubernetes/contrib/components/awx/requirements.yaml
index 222db38..8e588f5 100755
--- a/kubernetes/contrib/components/awx/requirements.yaml
+++ b/kubernetes/contrib/components/awx/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2019 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: awx-postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/awx-postgres'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/contrib/components/ejbca/Chart.yaml b/kubernetes/contrib/components/ejbca/Chart.yaml
index 2a0b4f3..638c6db 100644
--- a/kubernetes/contrib/components/ejbca/Chart.yaml
+++ b/kubernetes/contrib/components/ejbca/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP EJBCA test server
 name: ejbca
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/ejbca/requirements.yaml b/kubernetes/contrib/components/ejbca/requirements.yaml
index 284108c..dabf474 100644
--- a/kubernetes/contrib/components/ejbca/requirements.yaml
+++ b/kubernetes/contrib/components/ejbca/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Orange, Ericsson
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,22 +14,22 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: cmpv2Config
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/Chart.yaml b/kubernetes/contrib/components/netbox/Chart.yaml
index 43d82f4..a580269 100755
--- a/kubernetes/contrib/components/netbox/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Netbox IPAM
 name: netbox
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
index 8fa1585..d274160 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Netbox - Application (WSGI + Gunicorn)
 name: netbox-app
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
index 1b6f2d7..0bfe137 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
index d7e8218..af54335 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Netbox - Nginx web server
 name: netbox-nginx
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
index 1b6f2d7..0bfe137 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
index 5e4a792..435c7e2 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: Netbox Posgres database
 name: netbox-postgres
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
index 1b6f2d7..0bfe137 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/requirements.yaml b/kubernetes/contrib/components/netbox/requirements.yaml
index 7b63a82..467b6cf 100755
--- a/kubernetes/contrib/components/netbox/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: netbox-app
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/netbox-app'
   - name: netbox-nginx
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/netbox-nginx'
   - name: netbox-postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/netbox-postgres'
diff --git a/kubernetes/contrib/requirements.yaml b/kubernetes/contrib/requirements.yaml
index 20573f8..c6d0a19 100644
--- a/kubernetes/contrib/requirements.yaml
+++ b/kubernetes/contrib/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: awx
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/awx'
     condition: awx.enabled
   - name: ejbca
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/ejbca'
     condition: global.cmpv2Enabled
   - name: netbox
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/netbox'
     condition: netbox.enabled
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/cps/Chart.yaml b/kubernetes/cps/Chart.yaml
index 0837c72..fe80457 100644
--- a/kubernetes/cps/Chart.yaml
+++ b/kubernetes/cps/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2021 Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Configuration Persistance Service (CPS)
 name: cps
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cps/components/cps-core/Chart.yaml b/kubernetes/cps/components/cps-core/Chart.yaml
index 7100328..2d9274e 100644
--- a/kubernetes/cps/components/cps-core/Chart.yaml
+++ b/kubernetes/cps/components/cps-core/Chart.yaml
@@ -1,4 +1,5 @@
 #  Copyright (C) Pantheon.tech, Orange
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Configuration Persistance Service (CPS) - Core
 name: cps-core
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cps/components/cps-core/requirements.yaml b/kubernetes/cps/components/cps-core/requirements.yaml
index c42e72a..8a4ffbe 100644
--- a/kubernetes/cps/components/cps-core/requirements.yaml
+++ b/kubernetes/cps/components/cps-core/requirements.yaml
@@ -14,23 +14,23 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: global.postgres.localCluster
   - name: postgres-init
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: not global.postgres.localCluster
     #condition: global.postgres.postgresInit
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/cps/components/cps-temporal/Chart.yaml b/kubernetes/cps/components/cps-temporal/Chart.yaml
index ab4bfe7..99ff422 100644
--- a/kubernetes/cps/components/cps-temporal/Chart.yaml
+++ b/kubernetes/cps/components/cps-temporal/Chart.yaml
@@ -1,5 +1,6 @@
 # ============LICENSE_START=======================================================
 #  Copyright (c) 2021 Bell Canada.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP Configuration Persistance Service (CPS) - Temporal
 name: cps-temporal
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cps/components/cps-temporal/requirements.yaml b/kubernetes/cps/components/cps-temporal/requirements.yaml
index b2293db..442261d 100644
--- a/kubernetes/cps/components/cps-temporal/requirements.yaml
+++ b/kubernetes/cps/components/cps-temporal/requirements.yaml
@@ -1,5 +1,6 @@
 # ============LICENSE_START=======================================================
 #  Copyright (c) 2021 Bell Canada.
+#  Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,17 +19,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: timescaledb
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
index e99111d..729eeb2 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
@@ -1,5 +1,6 @@
 # ============LICENSE_START=======================================================
 # Copyright (C) 2021 Nordix Foundation
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP Configuration Persistance Service (CPS) - NCMP-DMI-Plugin
 name: ncmp-dmi-plugin
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml
index d1fbdd3..1814a7b 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/requirements.yaml
@@ -1,5 +1,6 @@
 # ============LICENSE_START=======================================================
 # Copyright (C) 2021 Nordix Foundation
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,14 +19,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/cps/requirements.yaml b/kubernetes/cps/requirements.yaml
index 0537233..bd9a80c 100644
--- a/kubernetes/cps/requirements.yaml
+++ b/kubernetes/cps/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2021 Bell Canada.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: cps-core
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: cps-core.enabled
   - name: cps-temporal
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: cps-temporal.enabled
   - name: ncmp-dmi-plugin
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
-    condition: ncmp-dmi-plugin.enabled
\ No newline at end of file
+    condition: ncmp-dmi-plugin.enabled
diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index 32f88ce..058d142 100644
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2020 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE Microservices
 name: dcaegen2-services
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
index ddf976e..6f9b3fd 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2020 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE Microservices Common templates
 name: dcaegen2-services-common
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml
index c903638..03f8b38 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2021 J. F. Lucas.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml
index a743d62..65944ff 100644
--- a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/Chart.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (c) 2021 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE BBS-EventProcessor Microservice
 name: dcae-bbs-eventprocessor-ms
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml
index e267e89..b02251c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-bbs-eventprocessor-ms/requirements.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
index e7cde04..2c5ecf9 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE DataFile Collector Helm charts
 name: dcae-datafile-collector
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml
index 540013e..a8c9898 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/requirements.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certManagerCertificate
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
index 70f68cf..24bb8e0 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,5 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE datalake-admin-ui helm chart
 name: dcae-datalake-admin-ui
-version: 8.0.0
-
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml
index 6412c80..af5b3bc 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/requirements.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
index 392db08..aa4c217 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE Datalake DES MS charts
 name: dcae-datalake-des
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml
index e0ac99d..0faf380 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-des/requirements.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 #  Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
index 1db95b8..1b70dcd 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (C) 2021 Wipro Limited
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE Datalake feeder MS charts
 name: dcae-datalake-feeder
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml
index fded2ce..a14fca9 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/requirements.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 #  Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
index feb3d53..a350b93 100644
--- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (c) 2021 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE Heartbeat Microservice
 name: dcae-heartbeat
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml
index ebfdcdb..dc8d47f 100644
--- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/requirements.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
index a5af26c..149b149 100644
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE HV VES collector
 name: dcae-hv-ves-collector
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml
index 9a2dc1a..a087828 100644
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml
@@ -1,6 +1,7 @@
 # Copyright (c) 2021 J. F. Lucas.  All rights reserved.
 # Copyright (c) 2021 Nokia.  All rights reserved.
 # Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,20 +17,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certManagerCertificate
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
index 336ffc4..4fa84cb 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,5 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE KPI MS chart
 name: dcae-kpi-ms
-version: 8.0.0
-
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml
index 4239867..824c637 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/requirements.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
index 8a6ca89..dbd2012 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
@@ -3,6 +3,7 @@
 # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 # Modifications Copyright © 2018 Amdocs, Bell Canada
 # Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,4 +22,4 @@
 appVersion: "Honolulu"
 description: ONAP DCAE Microservice Health Check
 name: dcae-ms-healthcheck
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml
index 3762a2a..747117c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml
@@ -2,6 +2,7 @@
 #=================================================================================
 # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 # Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,11 +19,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
index 1740464..5bd9b41 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE PM-Mapper Helm charts
 name: dcae-pm-mapper
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml
index c39c209..404489c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/requirements.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../common/dcaegen2-services-common'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
index 0ebda2e..49ccae4 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
@@ -2,6 +2,7 @@
 # ============================================================================
 # Copyright (C) 2021 Nordix Foundation.
 # Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,4 +21,4 @@
 appVersion: "Honolulu"
 description: DCAE PMSH Service
 name: dcae-pmsh
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml
index 44c3664..68c9165 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pmsh/requirements.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
index 7030324..8620332 100644
--- a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE PRH
 name: dcae-prh
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml
index 37ffafe..8006092 100644
--- a/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright (c) 2021 J. F. Lucas.  All rights reserved.
 # Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,17 +16,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
index f94f3cb..60445b1 100644
--- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (c) 2021 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE RESTConf Collector
 name: dcae-restconf-collector
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml
index e267e89..b02251c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/requirements.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
index 64b0d0f..b77f104 100644
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,5 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE SliceAnalysis MS charts
 name: dcae-slice-analysis-ms
-version: 8.0.0
-
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml
index c6ccf13..ed0ce49 100644
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/requirements.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
index 23020db..57beb71 100644
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (c) 2021 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE SNMPTrap Collector
 name: dcae-snmptrap-collector
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml
index e267e89..b02251c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/requirements.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
index f57b63a..707d31d 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
@@ -1,6 +1,7 @@
 # ============= LICENSE_START ================================================
 # ============================================================================
 # Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE Son-handler helm chart
 name: dcae-son-handler
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml
index 907f8f3..99f0fb7 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/requirements.yaml
@@ -1,6 +1,7 @@
 # ============= LICENSE_START ================================================
 # ============================================================================
 # Copyright (C) 2021 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,20 +18,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
index 99d3c3d..6b91fe3 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE TCA (Gen 2)
 name: dcae-tcagen2
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml
index b1d9fb2..48673fe 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright (c) 2020 J. F. Lucas.  All rights reserved.
 # Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,20 +16,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
index 851896c..43e893b 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 J. F. Lucas. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE VES Collector
 name: dcae-ves-collector
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml
index 9a2dc1a..a087828 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml
@@ -1,6 +1,7 @@
 # Copyright (c) 2021 J. F. Lucas.  All rights reserved.
 # Copyright (c) 2021 Nokia.  All rights reserved.
 # Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,20 +17,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certManagerCertificate
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
index 2dc7467..92fdb21 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (c) 2021 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 appVersion: "Honolulu"
 description: DCAE VES-Mapper Microservice
 name: dcae-ves-mapper
-version: 8.0.0
\ No newline at end of file
+version: 9.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml
index e267e89..b02251c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/requirements.yaml
@@ -1,6 +1,7 @@
 # ================================ LICENSE_START =============================
 # ============================================================================
 # Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,17 +18,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2-services/requirements.yaml b/kubernetes/dcaegen2-services/requirements.yaml
index 51368b6..b3432d3 100644
--- a/kubernetes/dcaegen2-services/requirements.yaml
+++ b/kubernetes/dcaegen2-services/requirements.yaml
@@ -1,6 +1,7 @@
 # Copyright (c) 2021 J. F. Lucas.  All rights reserved.
 # Copyright (c) 2021 AT&T. All rights reserved.
 # Modifications Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,81 +17,81 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcae-bbs-eventprocessor-ms
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-bbs-eventprocessor-ms.enabled
   - name: dcae-datafile-collector
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-datafile-collector.enabled
   - name: dcae-datalake-admin-ui
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-datalake-admin-ui.enabled
   - name: dcae-datalake-des
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-datalake-des.enabled
   - name: dcae-datalake-feeder
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-datalake-feeder.enabled
   - name: dcae-heartbeat
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-heartbeat.enabled
   - name: dcae-hv-ves-collector
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-hv-ves-collector.enabled
   - name: dcae-kpi-ms
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-kpi-ms.enabled
   - name: dcae-ms-healthcheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-ms-healthcheck.enabled
   - name: dcae-pm-mapper
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-pm-mapper.enabled
   - name: dcae-pmsh
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-pmsh.enabled
   - name: dcae-prh
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-prh.enabled
   - name: dcae-restconf-collector
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-restconf-collector.enabled
   - name: dcae-slice-analysis-ms
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-slice-analysis-ms.enabled
   - name: dcae-snmptrap-collector
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-snmptrap-collector.enabled
   - name: dcae-son-handler
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-son-handler.enabled
   - name: dcae-tcagen2
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-tcagen2.enabled
   - name: dcae-ves-collector
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-ves-collector.enabled
   - name: dcae-ves-mapper
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcae-ves-mapper.enabled
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index 35c9249..22c3c49 100644
--- a/kubernetes/dcaegen2/Chart.yaml
+++ b/kubernetes/dcaegen2/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, AT&T, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP DCAE Gen2
 name: dcaegen2
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
index c872e2e..f3127f7 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
@@ -2,6 +2,7 @@
 #=================================================================================
 # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 # Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP DCAE Bootstrap
 name: dcae-bootstrap
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
index b6eeb5b..4dcaff6 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
@@ -4,6 +4,7 @@
 # Modifications Copyright © 2018 Amdocs, Bell Canada
 # Modifications (c) 2020 Nokia. All rights reserved.
 # Copyright (c) 2021 J. F. Lucas.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,18 +21,18 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     alias: postgres
   - name: mongo
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
index 771d6a0..400c6b1 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
@@ -2,6 +2,7 @@
 # ================================================================================
 # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 # Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP DCAE Cloudify Manager
 name: dcae-cloudify-manager
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
index 877839e..590db41 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
@@ -1,6 +1,7 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
 # Copyright (c) 2021 J. F. Lucas.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,14 +17,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: cmpv2Config
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
index b5da7f3..49838a7 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE Config Binding Service
 name: dcae-config-binding-service
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
index f2c5b02..27373df 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
index 7a67595..7d1f13b 100644
--- a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
@@ -1,5 +1,23 @@
+#============LICENSE_START========================================================
+#=================================================================================
+# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+
 apiVersion: v1
 appVersion: "1.0"
 description: DCAE Dashboard
 name: dcae-dashboard
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
index 8759678..ee68792 100644
--- a/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
index c3f0fa1..5c3f785 100644
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE Deployment Handler
 name: dcae-deployment-handler
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
index 78bcd76..8712aa9 100644
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2019 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
index 0a0e942..d1af032 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
@@ -2,6 +2,7 @@
 # ================================================================================
 # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 # Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP DCAE Health Check
 name: dcae-healthcheck
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
index 3762a2a..747117c 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
@@ -2,6 +2,7 @@
 #=================================================================================
 # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 # Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,11 +19,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
index abd65d6..5411fa7 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE Inventory API Service
 name: dcae-inventory-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
index 32d8b5b..4138afb 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
index e1d41f2..ab42b43 100644
--- a/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE Policy Handler
 name: dcae-policy-handler
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
index 78bcd76..8712aa9 100644
--- a/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2019 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
index 61b98a7..a0a4e74 100644
--- a/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE Service Change Handler
 name: dcae-servicechange-handler
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
index f2c5b02..27373df 100644
--- a/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
index ae17610..4fc1ae2 100644
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 Nokia. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE VES OpenApi Manager
 name: dcae-ves-openapi-manager
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml
index 9a3009d..3400a24 100644
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml
@@ -1,5 +1,6 @@
 #============LICENSE_START========================================================
 # Copyright (c) 2021 Nokia. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,14 +17,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/requirements.yaml b/kubernetes/dcaegen2/requirements.yaml
index 206cfd0..b9aaa3a 100644
--- a/kubernetes/dcaegen2/requirements.yaml
+++ b/kubernetes/dcaegen2/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
 # Modifications Copyright © 2021 Nokia
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,45 +16,45 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: dcae-bootstrap
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dcae-bootstrap'
     condition: dcae-bootstrap.enabled
   - name: dcae-cloudify-manager
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dcae-cloudify-manager'
     condition: dcae-cloudify-manager.enabled
   - name: dcae-config-binding-service
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dcae-config-binding-service'
     condition: dcae-config-binding-service.enabled
   - name: dcae-healthcheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dcae-healthcheck'
     condition: dcae-healthcheck.enabled
   - name: dcae-servicechange-handler
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dcae-servicechange-handler'
     condition: dcae-servicechange-handler.enabled
   - name: dcae-inventory-api
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dcae-inventory-api'
     condition: dcae-inventory-api.enabled
   - name: dcae-deployment-handler
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dcae-deployment-handler'
     condition: dcae-deployment-handler.enabled
   - name: dcae-policy-handler
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dcae-policy-handler'
     condition: dcae-policy-handler.enabled
   - name: dcae-dashboard
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dcae-dashboard'
     condition: dcae-dashboard.enabled
   - name: dcae-ves-openapi-manager
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dcae-ves-openapi-manager'
     condition: dcae-ves-openapi-manager.enabled
diff --git a/kubernetes/dcaemod/Chart.yaml b/kubernetes/dcaemod/Chart.yaml
index b5d84f6..b198e4d 100644
--- a/kubernetes/dcaemod/Chart.yaml
+++ b/kubernetes/dcaemod/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD
 name: dcaemod
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
index c6572de..09c8942 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Design Tool
 name: dcaemod-designtool
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
index 233f6e4..31acb0b 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,11 +18,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
index 9245bc9..9c43059 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Distributor API
 name: dcaemod-distributor-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
index 2684426..1f77713 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,11 +18,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
index e1885a2..acabde6 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Genprocessor
 name: dcaemod-genprocessor
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
index 2684426..1f77713 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,11 +18,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
index 929eb67..95f140a 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
@@ -2,6 +2,7 @@
 # ================================================================================
 # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 # Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Health Check
 name: dcaemod-healthcheck
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
index 3762a2a..747117c 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
@@ -2,6 +2,7 @@
 #=================================================================================
 # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 # Modifications Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,11 +19,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
index cf1b896..6bd9046 100644
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Nifi Registry
 name: dcaemod-nifi-registry
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
index 2684426..1f77713 100644
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,11 +18,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
index ec660c2..1595250 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Onboarding API
 name: dcaemod-onboarding-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
index 9320cd0..396cf7a 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,14 +18,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
index cb7715e..814e1df 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Runtime API
 name: dcaemod-runtime-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
index 2684426..1f77713 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,11 +18,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dcaemod/requirements.yaml b/kubernetes/dcaemod/requirements.yaml
index 649e3be..0ecbc55 100644
--- a/kubernetes/dcaemod/requirements.yaml
+++ b/kubernetes/dcaemod/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2020 AT&T Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,33 +15,33 @@
 
 dependencies:
     - name: common
-      version: ~8.x-0
+      version: ~9.x-0
       repository: '@local'
     - name: dcaemod-genprocessor
-      version: ~8.x-0
+      version: ~9.x-0
       repository: 'file://components/dcaemod-genprocessor'
       condition: dcaemod-genprocessor.enabled
     - name: dcaemod-distributor-api
-      version: ~8.x-0
+      version: ~9.x-0
       repository: 'file://components/dcaemod-distributor-api'
       condition: dcaemod-distributor-api.enabled
     - name: dcaemod-designtool
-      version: ~8.x-0
+      version: ~9.x-0
       repository: 'file://components/dcaemod-designtool'
       condition: dcaemod-designtool.enabled
     - name: dcaemod-onboarding-api
-      version: ~8.x-0
+      version: ~9.x-0
       repository: 'file://components/dcaemod-onboarding-api'
       condition: dcaemod-onboarding-api.enabled
     - name: dcaemod-runtime-api
-      version: ~8.x-0
+      version: ~9.x-0
       repository: 'file://components/dcaemod-runtime-api'
       condition: dcaemod-runtime-api.enabled
     - name: dcaemod-nifi-registry
-      version: ~8.x-0
+      version: ~9.x-0
       repository: 'file://components/dcaemod-nifi-registry'
       condition: dcaemod-nifi-registry.enabled
     - name: dcaemod-healthcheck
-      version: ~8.x-0
+      version: ~9.x-0
       repository: 'file://components/dcaemod-healthcheck'
       condition: dcaemod-healthcheck.enabled
diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml
index c57858d..e0b0c38 100644
--- a/kubernetes/dmaap/Chart.yaml
+++ b/kubernetes/dmaap/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
 # Modifications Copyright © 2018 Amdocs,Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP DMaaP components
 name: dmaap
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
index 0b6b3bf..433c065 100644
--- a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
 # Modifications Copyright © 2018 Amdocs,Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
 name: dmaap-bc
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
index 7c26bb8..10a617d 100644
--- a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,18 +15,18 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: PG.enabled
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
index bc9a734..87b5fa1 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP DMaaP Data Router Node Server
 name: dmaap-dr-node
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
index b7e9dce..4feb42d 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
@@ -1,6 +1,7 @@
 #
 # ============LICENSE_START=======================================================
 #  Copyright (C) 2019 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,14 +21,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
index 5b0666e..94fc443 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP DMaaP Data Router Provisioning Server
 name: dmaap-dr-prov
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
index 3c25c94..01d481a 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
@@ -1,6 +1,7 @@
 #
 # ============LICENSE_START=======================================================
 #  Copyright (C) 2019 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,21 +21,21 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/Chart.yaml b/kubernetes/dmaap/components/message-router/Chart.yaml
index 637395f..7bd389e 100644
--- a/kubernetes/dmaap/components/message-router/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Message Router
 name: message-router
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
index 3e4bb7f..76a4883 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Message Router Kafka Service
 name: message-router-kafka
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml
index c212f38..f85585d 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,17 +16,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
index 566d14f..c3a1282 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Dmaap Message Router Zookeeper Service
 name: message-router-zookeeper
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml
index 20cc48f..74c05f4 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/requirements.yaml b/kubernetes/dmaap/components/message-router/requirements.yaml
index 00d1454..4dfa82b 100644
--- a/kubernetes/dmaap/components/message-router/requirements.yaml
+++ b/kubernetes/dmaap/components/message-router/requirements.yaml
@@ -16,23 +16,23 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: message-router-kafka
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/message-router-kafka'
   - name: message-router-zookeeper
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/message-router-zookeeper'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/dmaap/requirements.yaml b/kubernetes/dmaap/requirements.yaml
index 268ff70..b1a8f3a 100644
--- a/kubernetes/dmaap/requirements.yaml
+++ b/kubernetes/dmaap/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
 # Modifications Copyright © 2018 Amdocs,Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,24 +16,24 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: message-router
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/message-router'
     condition: message-router.enabled
   - name: dmaap-bc
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dmaap-bc'
     condition: dmaap-bc.enabled
   - name: dmaap-dr-node
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dmaap-dr-node'
     condition: dmaap-dr-node.enabled
   - name: dmaap-dr-prov
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dmaap-dr-prov'
     condition: dmaap-dr-prov.enabled
   - name: serviceAccount
-    version: ~8.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/helm/starters/onap-app/Chart.yaml b/kubernetes/helm/starters/onap-app/Chart.yaml
index d039f44..87a62ed 100644
--- a/kubernetes/helm/starters/onap-app/Chart.yaml
+++ b/kubernetes/helm/starters/onap-app/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: <Short application description - this is visible via 'helm search'>
 name: <onap-app>
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/helm/starters/onap-app/requirements.yaml b/kubernetes/helm/starters/onap-app/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/helm/starters/onap-app/requirements.yaml
+++ b/kubernetes/helm/starters/onap-app/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/holmes/Chart.yaml b/kubernetes/holmes/Chart.yaml
index b6717ef..b636d38 100644
--- a/kubernetes/holmes/Chart.yaml
+++ b/kubernetes/holmes/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2021  ZTE
+# Modifications Copyright © 2021 ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP DCAE HOLMES
 name: holmes
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
index 31c0906..4df9ff0 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
@@ -1,5 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 ZTE
+# Modifications Copyright © 2021 Orange
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 appVersion: "1.0"
 description: Holmes Engine Management
 name: holmes-engine-mgmt
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml
index ab839d0..2e9004a 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
index ba40234..f98c78b 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
@@ -1,5 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 ZTE
+# Modifications Copyright © 2021 Orange
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 appVersion: "1.0"
 description: Holmes Rule Management
 name: holmes-rule-mgmt
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml
index ab839d0..2e9004a 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/holmes/requirements.yaml b/kubernetes/holmes/requirements.yaml
index 3903636..d1200fd 100644
--- a/kubernetes/holmes/requirements.yaml
+++ b/kubernetes/holmes/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: holmes-rule-mgmt
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/holmes-rule-mgmt'
   - name: holmes-engine-mgmt
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/holmes-engine-mgmt'
diff --git a/kubernetes/log/Chart.yaml b/kubernetes/log/Chart.yaml
index 7a183f6..0df7470 100644
--- a/kubernetes/log/Chart.yaml
+++ b/kubernetes/log/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Logging ElasticStack
 name: log
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/log/components/log-elasticsearch/Chart.yaml b/kubernetes/log/components/log-elasticsearch/Chart.yaml
index 6ea1c79..719f6ad 100644
--- a/kubernetes/log/components/log-elasticsearch/Chart.yaml
+++ b/kubernetes/log/components/log-elasticsearch/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Logging Elasticsearch
 name: log-elasticsearch
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/log/components/log-elasticsearch/requirements.yaml b/kubernetes/log/components/log-elasticsearch/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/log/components/log-elasticsearch/requirements.yaml
+++ b/kubernetes/log/components/log-elasticsearch/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/log/components/log-kibana/Chart.yaml b/kubernetes/log/components/log-kibana/Chart.yaml
index 0b8c432..cfa1c88 100644
--- a/kubernetes/log/components/log-kibana/Chart.yaml
+++ b/kubernetes/log/components/log-kibana/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Logging Kibana
 name: log-kibana
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/log/components/log-kibana/requirements.yaml b/kubernetes/log/components/log-kibana/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/log/components/log-kibana/requirements.yaml
+++ b/kubernetes/log/components/log-kibana/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/log/components/log-logstash/Chart.yaml b/kubernetes/log/components/log-logstash/Chart.yaml
index 543b1f5..aca2909 100644
--- a/kubernetes/log/components/log-logstash/Chart.yaml
+++ b/kubernetes/log/components/log-logstash/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Logging Logstash
 name: log-logstash
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/log/components/log-logstash/requirements.yaml b/kubernetes/log/components/log-logstash/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/log/components/log-logstash/requirements.yaml
+++ b/kubernetes/log/components/log-logstash/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/log/requirements.yaml b/kubernetes/log/requirements.yaml
index aba35bc..ba744af 100644
--- a/kubernetes/log/requirements.yaml
+++ b/kubernetes/log/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: log-elasticsearch
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/log-elasticsearch'
   - name: log-kibana
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/log-kibana'
   - name: log-logstash
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/log-logstash'
diff --git a/kubernetes/modeling/Chart.yaml b/kubernetes/modeling/Chart.yaml
index ea1e28b..7e7be74 100644
--- a/kubernetes/modeling/Chart.yaml
+++ b/kubernetes/modeling/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Modeling (Modeling)
 name: modeling
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
index fcac20b..942915b 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Modeling - Etsicatalog
 name: modeling-etsicatalog
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml b/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
index 6070b0c..686d936 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Samung Electronics
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,22 +15,22 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/modeling/requirements.yaml b/kubernetes/modeling/requirements.yaml
index e2f7a75..af247fc 100644
--- a/kubernetes/modeling/requirements.yaml
+++ b/kubernetes/modeling/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +15,5 @@
 
 dependencies:
   - name: modeling-etsicatalog
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/modeling-etsicatalog'
diff --git a/kubernetes/msb/Chart.yaml b/kubernetes/msb/Chart.yaml
index 9c9ae56..14eb4d3 100644
--- a/kubernetes/msb/Chart.yaml
+++ b/kubernetes/msb/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018  ZTE
+# Modifications Copyright © 2018 ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus
 name: msb
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/kube2msb/Chart.yaml b/kubernetes/msb/components/kube2msb/Chart.yaml
index 70dd462..dcafd05 100644
--- a/kubernetes/msb/components/kube2msb/Chart.yaml
+++ b/kubernetes/msb/components/kube2msb/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Kube2MSB Registrator
 name: kube2msb
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/kube2msb/requirements.yaml b/kubernetes/msb/components/kube2msb/requirements.yaml
index f783c76..dbb7638 100644
--- a/kubernetes/msb/components/kube2msb/requirements.yaml
+++ b/kubernetes/msb/components/kube2msb/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,8 +14,8 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/msb/components/msb-consul/Chart.yaml b/kubernetes/msb/components/msb-consul/Chart.yaml
index 9666dc6..7f8ba44 100644
--- a/kubernetes/msb/components/msb-consul/Chart.yaml
+++ b/kubernetes/msb/components/msb-consul/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Consul
 name: msb-consul
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/msb-consul/requirements.yaml b/kubernetes/msb/components/msb-consul/requirements.yaml
index f783c76..dbb7638 100644
--- a/kubernetes/msb/components/msb-consul/requirements.yaml
+++ b/kubernetes/msb/components/msb-consul/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,8 +14,8 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/msb/components/msb-discovery/Chart.yaml b/kubernetes/msb/components/msb-discovery/Chart.yaml
index 50465b9..4bb3e2b 100644
--- a/kubernetes/msb/components/msb-discovery/Chart.yaml
+++ b/kubernetes/msb/components/msb-discovery/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Discovery
 name: msb-discovery
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/msb-discovery/requirements.yaml b/kubernetes/msb/components/msb-discovery/requirements.yaml
index f783c76..dbb7638 100644
--- a/kubernetes/msb/components/msb-discovery/requirements.yaml
+++ b/kubernetes/msb/components/msb-discovery/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,8 +14,8 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/msb/components/msb-eag/Chart.yaml b/kubernetes/msb/components/msb-eag/Chart.yaml
index 8557bf2..bdb7498 100644
--- a/kubernetes/msb/components/msb-eag/Chart.yaml
+++ b/kubernetes/msb/components/msb-eag/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Internal API Gateway
 name: msb-eag
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/msb-eag/requirements.yaml b/kubernetes/msb/components/msb-eag/requirements.yaml
index 1a256d1..3fea5d0 100644
--- a/kubernetes/msb/components/msb-eag/requirements.yaml
+++ b/kubernetes/msb/components/msb-eag/requirements.yaml
@@ -14,11 +14,11 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/msb/components/msb-iag/Chart.yaml b/kubernetes/msb/components/msb-iag/Chart.yaml
index ceec797..38872ab 100644
--- a/kubernetes/msb/components/msb-iag/Chart.yaml
+++ b/kubernetes/msb/components/msb-iag/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada , ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Internal API Gateway
 name: msb-iag
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/msb/components/msb-iag/requirements.yaml b/kubernetes/msb/components/msb-iag/requirements.yaml
index 1a256d1..3fea5d0 100644
--- a/kubernetes/msb/components/msb-iag/requirements.yaml
+++ b/kubernetes/msb/components/msb-iag/requirements.yaml
@@ -14,11 +14,11 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/msb/requirements.yaml b/kubernetes/msb/requirements.yaml
index f365479..3adce0f 100644
--- a/kubernetes/msb/requirements.yaml
+++ b/kubernetes/msb/requirements.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada , ZTE
-# Copyright © 2020 Orange
+# Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,23 +14,23 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: kube2msb
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/kube2msb'
   - name: msb-consul
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/msb-consul'
   - name: msb-discovery
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/msb-discovery'
   - name: msb-eag
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/msb-eag'
   - name: msb-iag
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/msb-iag'
diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index 8093d70..ff43734 100644
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP multicloud broker
 name: multicloud
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
index 95b82ab..1b55afc 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2019, CMCC Technologies Co., Ltd.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack fcaps Plugin
 name: multicloud-fcaps
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
index 105721c..813ed1b 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright 2019 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Multicloud Kubernetes Plugin
 name: multicloud-k8s
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
index acbc39b..434abf9 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright 2019 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: mongo
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: etcd
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
index 19f24e3..e150ef3 100644
--- a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2018 Intel Corporation.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack Pike Plugin
 name: multicloud-pike
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
index 4280c33..f1e00cd 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Multicloud Prometheus
 name: multicloud-prometheus
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
index 203c6ee..16a126a 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Multicloud Prometheus Alert Manager
 name: prometheus-alertmanager
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
index 7ae66c6..a6df6e1 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018 Intel Corporation, Inc
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Multicloud Grafana for Prometheus
 name: prometheus-grafana
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
index fb61cca..09630f0 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: prometheus-alertmanager
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/prometheus-alertmanager'
   - name: prometheus-grafana
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/prometheus-grafana'
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
index 9c6ce77..17e33ef 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2019 Intel Corporation.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack Starlingx Plugin
 name: multicloud-starlingx
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
index df18003..2247c33 100644
--- a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP multicloud VIO plugin
 name: multicloud-vio
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
index ddeca7c..3291c83 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack WindRiver Plugin
 name: multicloud-windriver
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
index be5f059..c2d6f85 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +16,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/requirements.yaml b/kubernetes/multicloud/requirements.yaml
index 7b909eb..2af2eb9 100644
--- a/kubernetes/multicloud/requirements.yaml
+++ b/kubernetes/multicloud/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,36 +16,36 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: multicloud-fcaps
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/multicloud-fcaps'
     condition: multicloud-fcaps.enabled
   - name: multicloud-k8s
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/multicloud-k8s'
     condition: multicloud-k8s.enabled
   - name: multicloud-pike
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/multicloud-pike'
     condition: multicloud-pike.enabled
   - name: multicloud-prometheus
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/multicloud-prometheus'
     condition: multicloud-prometheus.enabled
   - name: multicloud-starlingx
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/multicloud-starlingx'
     condition: multicloud-starlingx.enabled
   - name: multicloud-vio
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/multicloud-vio'
     condition: multicloud-vio.enabled
   - name: multicloud-windriver
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/multicloud-windriver'
     condition: multicloud-windriver.enabled
diff --git a/kubernetes/nbi/Chart.yaml b/kubernetes/nbi/Chart.yaml
index 562714c..78929b7 100644
--- a/kubernetes/nbi/Chart.yaml
+++ b/kubernetes/nbi/Chart.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018  Orange
+# Modifications Copyright © 2018,2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Northbound Interface
 name: nbi
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/nbi/requirements.yaml b/kubernetes/nbi/requirements.yaml
index 7062a13..f54b915 100644
--- a/kubernetes/nbi/requirements.yaml
+++ b/kubernetes/nbi/requirements.yaml
@@ -1,5 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 Orange
+# Modifications Copyright © 2018,2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,25 +15,25 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: mongo
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 94bf304..21ff5a5 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -14,11 +14,11 @@
 
 apiVersion: v1
 name: onap
-version: 8.0.0
-appVersion: Guilin
+version: 9.0.0
+appVersion: Istanbul
 description: Open Network Automation Platform (ONAP)
 home: https://www.onap.org/
 sources:
 - https://gerrit.onap.org/r/#/admin/projects/
 icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2
-kubeVersion: ">=1.11.5-0"
+kubeVersion: ">=1.19"
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 0a1e769..694546f 100755
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -1,7 +1,7 @@
 # Copyright © 2019 Amdocs, Bell Canada
 # Copyright (c) 2020 Nordix Foundation, Modifications
 # Modifications Copyright © 2020 Nokia
-# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2020-2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,160 +21,160 @@
 # > helm repo add local http://127.0.0.1:8879
 dependencies:
   - name: aaf
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: aaf.enabled
   - name: aai
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: aai.enabled
   - name: appc
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: appc.enabled
   - name: cassandra
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: cassandra.enabled
   - name: cds
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: cds.enabled
   - name: cli
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: cli.enabled
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: consul
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: consul.enabled
   - name: contrib
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: global.addTestingComponents
   - name: cps
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: cps.enabled
   - name: dcaegen2
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcaegen2.enabled
   - name: dcaegen2-services
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcaegen2-services.enabled
   - name: dcaemod
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dcaemod.enabled
   - name: holmes
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: holmes.enabled
   - name: dmaap
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dmaap.enabled
   - name: log
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: log.enabled
   - name: sniro-emulator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: sniro-emulator.enabled
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: mariadb-galera.enabled
   - name: msb
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: msb.enabled
   - name: multicloud
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: multicloud.enabled
   - name: nbi
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: nbi.enabled
   - name: policy
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: policy.enabled
   - name: portal
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: portal.enabled
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: postgres.enabled
   - name: oof
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: oof.enabled
   - name: repository-wrapper
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: robot
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: robot.enabled
   - name: sdc
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: sdc.enabled
   - name: sdnc
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: sdnc.enabled
   - name: so
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: so.enabled
   - name: uui
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: uui.enabled
   - name: vfc
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: vfc.enabled
   - name: vid
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: vid.enabled
   - name: vnfsdk
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: vnfsdk.enabled
   - name: modeling
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: modeling.enabled
   - name: platform
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: platform.enabled
   - name: a1policymanagement
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: a1policymanagement.enabled
   - name: cert-wrapper
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: cert-wrapper.enabled
   - name: roles-wrapper
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: roles-wrapper.enabled
   - name: timescaledb
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: timescaledb.enabled
diff --git a/kubernetes/oof/Chart.yaml b/kubernetes/oof/Chart.yaml
index 382b400..8b436da 100755
--- a/kubernetes/oof/Chart.yaml
+++ b/kubernetes/oof/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Optimization Framework
 name: oof
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/Chart.yaml b/kubernetes/oof/components/oof-has/Chart.yaml
index c76136d..65b30e2 100755
--- a/kubernetes/oof/components/oof-has/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Service
 name: oof-has
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
index be6442e..b4f8a5f 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Servicei - API
 name: oof-has-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml
index de5d276..1569471 100644
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
index 5f88b8e..2b0a244 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Sservice - Controller
 name: oof-has-controller
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml
index b87d5ad..a199ea8 100644
--- a/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
index 83d99cb..6413a07 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Service - Data Component
 name: oof-has-data
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml
index b87d5ad..a199ea8 100644
--- a/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
index a319abd..25bfb24 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Sevice - Reservation Component
 name: oof-has-reservation
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml
index b87d5ad..a199ea8 100644
--- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
index 8ca0aeb..f60e6ae 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Service - Solver Component
 name: oof-has-solver
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml
index b87d5ad..a199ea8 100644
--- a/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/requirements.yaml b/kubernetes/oof/components/oof-has/requirements.yaml
index 7310aac..33081ea 100755
--- a/kubernetes/oof/components/oof-has/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,40 +16,40 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: music
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: music.enabled
   - name: etcd
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: etcd.enabled
   - name: etcd-init
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: etcd-init.enabled
   - name: oof-has-api
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/oof-has-api'
     condition: oof-has-api.enabled
   - name: oof-has-controller
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/oof-has-controller'
     condition: oof-has-controller.enabled
   - name: oof-has-data
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/oof-has-data'
     condition: oof-has-data.enabled
   - name: oof-has-reservation
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/oof-has-reservation'
     condition: oof-has-reservation.enabled
   - name: oof-has-solver
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/oof-has-solver'
     condition: oof-has-solver.enabled
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-templates/Chart.yaml b/kubernetes/oof/components/oof-templates/Chart.yaml
index 4d7e4a8..5bb0add 100755
--- a/kubernetes/oof/components/oof-templates/Chart.yaml
+++ b/kubernetes/oof/components/oof-templates/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP OOF helm templates
 name: oof-templates
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/oof/components/oof-templates/requirements.yaml b/kubernetes/oof/components/oof-templates/requirements.yaml
index 000e524..73b49e8 100755
--- a/kubernetes/oof/components/oof-templates/requirements.yaml
+++ b/kubernetes/oof/components/oof-templates/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,5 +16,5 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/oof/requirements.yaml b/kubernetes/oof/requirements.yaml
index c17c89f..16ecadb 100755
--- a/kubernetes/oof/requirements.yaml
+++ b/kubernetes/oof/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T,VMware
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,18 +16,18 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: oof-has
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/oof-has'
     condition: oof-has.enabled
   - name: oof-templates
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/oof-templates'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/platform/Chart.yaml b/kubernetes/platform/Chart.yaml
index 56df595..8f8d565 100644
--- a/kubernetes/platform/Chart.yaml
+++ b/kubernetes/platform/Chart.yaml
@@ -1,6 +1,7 @@
 # Copyright © 2018 ZTE
 # Modifications Copyright © 2018 AT&T, Amdocs, Bell Canada
 # Modifications Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,4 +18,4 @@
 apiVersion: v1
 description: ONAP platform components
 name: platform
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/platform/components/chartmuseum/Chart.yaml b/kubernetes/platform/components/chartmuseum/Chart.yaml
index 1aa8d92..eba65a2 100644
--- a/kubernetes/platform/components/chartmuseum/Chart.yaml
+++ b/kubernetes/platform/components/chartmuseum/Chart.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,4 +19,4 @@
 apiVersion: v1
 description: ONAP Chart Museum
 name: chartmuseum
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/platform/components/chartmuseum/requirements.yaml b/kubernetes/platform/components/chartmuseum/requirements.yaml
index 07ac4b4..1847e4e 100644
--- a/kubernetes/platform/components/chartmuseum/requirements.yaml
+++ b/kubernetes/platform/components/chartmuseum/requirements.yaml
@@ -1,5 +1,6 @@
 #============LICENSE_START========================================================
 # Copyright (c) 2021 AT&T. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,14 +17,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml b/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
index 0e6336b..549b1fd 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP CMPv2 certificate external provider for cert-manager
 name: cmpv2-cert-provider
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml b/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
index f570517..a4b3c3d 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -13,8 +14,8 @@
 
  dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/platform/components/oom-cert-service/Chart.yaml b/kubernetes/platform/components/oom-cert-service/Chart.yaml
index d47226d..52f8d37 100644
--- a/kubernetes/platform/components/oom-cert-service/Chart.yaml
+++ b/kubernetes/platform/components/oom-cert-service/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Nokia
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Cert Service
 name: oom-cert-service
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/platform/components/oom-cert-service/requirements.yaml b/kubernetes/platform/components/oom-cert-service/requirements.yaml
index 6177278..6ddec4b 100644
--- a/kubernetes/platform/components/oom-cert-service/requirements.yaml
+++ b/kubernetes/platform/components/oom-cert-service/requirements.yaml
@@ -1,4 +1,4 @@
- # Copyright © 2020 Orange
+# Copyright © 2020 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certManagerCertificate
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: cmpv2Config
-    version: ~8.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/platform/requirements.yaml b/kubernetes/platform/requirements.yaml
index ce33101..96ab5d0 100644
--- a/kubernetes/platform/requirements.yaml
+++ b/kubernetes/platform/requirements.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2020 Orange
+# Modifications Copyright © 2020-2021 Orange
 # Modifications Copyright © 2020 Nokia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +17,11 @@
 
 dependencies:
   - name: oom-cert-service
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/oom-cert-service'
   - name: cmpv2-cert-provider
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/cmpv2-cert-provider'
   - name: chartmuseum
-    version: ~8.x-0
-    repository: 'file://components/chartmuseum'
\ No newline at end of file
+    version: ~9.x-0
+    repository: 'file://components/chartmuseum'
diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
index 26b425f..f983344 100755
--- a/kubernetes/policy/Chart.yaml
+++ b/kubernetes/policy/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018, 2020 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Policy
 name: policy
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
index 6e3d678..6f3e517 100755
--- a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP Policy APEX PDP
 name: policy-apex-pdp
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml b/kubernetes/policy/components/policy-apex-pdp/requirements.yaml
index f320b21..9a57a49 100755
--- a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/requirements.yaml
@@ -1,6 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   Modifications Copyright © 2020 AT&T. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,14 +20,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-api/Chart.yaml b/kubernetes/policy/components/policy-api/Chart.yaml
index a025e7e..1c7fba4 100755
--- a/kubernetes/policy/components/policy-api/Chart.yaml
+++ b/kubernetes/policy/components/policy-api/Chart.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP Policy Design API
 name: policy-api
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-api/requirements.yaml b/kubernetes/policy/components/policy-api/requirements.yaml
index 2365cd7..09b6249 100755
--- a/kubernetes/policy/components/policy-api/requirements.yaml
+++ b/kubernetes/policy/components/policy-api/requirements.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,14 +19,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-be/Chart.yaml b/kubernetes/policy/components/policy-clamp-be/Chart.yaml
index 8ec44e0..9c4f573 100644
--- a/kubernetes/policy/components/policy-clamp-be/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Policy Clamp Backend
 name: policy-clamp-be
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-clamp-be/requirements.yaml b/kubernetes/policy/components/policy-clamp-be/requirements.yaml
index 670f8cb..c72d9fa 100644
--- a/kubernetes/policy/components/policy-clamp-be/requirements.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
 
 dependencies:
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml
index 3bdcad6..e880ee3 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/Chart.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #  Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#  Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP Policy Clamp Controlloop K8s Participant
 name: policy-clamp-cl-k8s-ppnt
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml
index 7878f91..b4dba11 100644
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/requirements.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,14 +19,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml b/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml
index b7c44d7..bbcdb1f 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-runtime/Chart.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP Policy Clamp Controlloop Runtime
 name: policy-clamp-cl-runtime
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml b/kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml
index 7878f91..b4dba11 100644
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-runtime/requirements.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,14 +19,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-fe/Chart.yaml b/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
index 2c0faa9..c511c37 100644
--- a/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Policy Clamp Frontend
 name: policy-clamp-fe
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-clamp-fe/requirements.yaml b/kubernetes/policy/components/policy-clamp-fe/requirements.yaml
index 670f8cb..c72d9fa 100644
--- a/kubernetes/policy/components/policy-clamp-fe/requirements.yaml
+++ b/kubernetes/policy/components/policy-clamp-fe/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +16,11 @@
 
 dependencies:
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-distribution/Chart.yaml b/kubernetes/policy/components/policy-distribution/Chart.yaml
index f3481e3..b3ee15e 100755
--- a/kubernetes/policy/components/policy-distribution/Chart.yaml
+++ b/kubernetes/policy/components/policy-distribution/Chart.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP Policy Distribution
 name: policy-distribution
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-distribution/requirements.yaml b/kubernetes/policy/components/policy-distribution/requirements.yaml
index db84102..1a3127b 100755
--- a/kubernetes/policy/components/policy-distribution/requirements.yaml
+++ b/kubernetes/policy/components/policy-distribution/requirements.yaml
@@ -1,6 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   Modifications Copyright (C) 2020 AT&T. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,14 +20,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
index 0000e48..5ed9a70 100755
--- a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018, 2020 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Drools Policy Engine (PDP-D)
 name: policy-drools-pdp
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-drools-pdp/requirements.yaml b/kubernetes/policy/components/policy-drools-pdp/requirements.yaml
index 6c540a4..68b10de 100755
--- a/kubernetes/policy/components/policy-drools-pdp/requirements.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018, 2020 AT&T Intellectual Property
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-gui/Chart.yaml b/kubernetes/policy/components/policy-gui/Chart.yaml
index 58ece99..a407ea9 100644
--- a/kubernetes/policy/components/policy-gui/Chart.yaml
+++ b/kubernetes/policy/components/policy-gui/Chart.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2021 Nordix Foundation.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP Policy GUI
 name: policy-gui
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-gui/requirements.yaml b/kubernetes/policy/components/policy-gui/requirements.yaml
index c9b17cb..acf19af 100644
--- a/kubernetes/policy/components/policy-gui/requirements.yaml
+++ b/kubernetes/policy/components/policy-gui/requirements.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2021 Nordix Foundation.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,11 +19,11 @@
 
 dependencies:
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-nexus/Chart.yaml b/kubernetes/policy/components/policy-nexus/Chart.yaml
index 3e28bae..5f4276b 100755
--- a/kubernetes/policy/components/policy-nexus/Chart.yaml
+++ b/kubernetes/policy/components/policy-nexus/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018-2020 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Policy Nexus
 name: policy-nexus
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-nexus/requirements.yaml b/kubernetes/policy/components/policy-nexus/requirements.yaml
index 20cc48f..74c05f4 100755
--- a/kubernetes/policy/components/policy-nexus/requirements.yaml
+++ b/kubernetes/policy/components/policy-nexus/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-pap/Chart.yaml b/kubernetes/policy/components/policy-pap/Chart.yaml
index a3b3f18..8f02c83 100755
--- a/kubernetes/policy/components/policy-pap/Chart.yaml
+++ b/kubernetes/policy/components/policy-pap/Chart.yaml
@@ -1,6 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2019 Nordix Foundation.
 #   Modified Copyright (C) 2020 AT&T Intellectual Property.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -20,4 +21,4 @@
 apiVersion: v1
 description: ONAP Policy Administration (PAP)
 name: policy-pap
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-pap/requirements.yaml b/kubernetes/policy/components/policy-pap/requirements.yaml
index 18de3a6..c146e3e 100755
--- a/kubernetes/policy/components/policy-pap/requirements.yaml
+++ b/kubernetes/policy/components/policy-pap/requirements.yaml
@@ -1,6 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2019 Nordix Foundation.
 #   Modified Copyright (C) 2020 AT&T Intellectual Property.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,14 +20,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
index cf07d84..f043939 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: ONAP Policy XACML PDP (PDP-X)
 name: policy-xacml-pdp
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml b/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
index 2365cd7..09b6249 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,14 +19,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/policy/requirements.yaml b/kubernetes/policy/requirements.yaml
index 0ba1535..65ca87b 100755
--- a/kubernetes/policy/requirements.yaml
+++ b/kubernetes/policy/requirements.yaml
@@ -1,6 +1,7 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018, 2020 AT&T
 # Modifications Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,62 +17,62 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: policy-nexus
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-nexus'
     condition: policy-nexus.enabled
   - name: policy-api
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-api'
     condition: policy-api.enabled
   - name: policy-pap
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-pap'
     condition: policy-pap.enabled
   - name: policy-xacml-pdp
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-xacml-pdp'
     condition: policy-xacml-pdp.enabled
   - name: policy-apex-pdp
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-apex-pdp'
     condition: policy-apex-pdp.enabled
   - name: policy-drools-pdp
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-drools-pdp'
     condition: policy-drools-pdp.enabled
   - name: policy-distribution
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-distribution'
     condition: policy-distribution.enabled
   - name: policy-clamp-be
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-clamp-be'
     condition: policy-clamp-be.enabled
   - name: policy-clamp-fe
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-clamp-fe'
     condition: policy-clamp-fe.enabled
   - name: policy-clamp-cl-k8s-ppnt
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-clamp-cl-k8s-ppnt'
     condition: policy-clamp-cl-k8s-ppnt.enabled
   - name: policy-clamp-cl-runtime
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-clamp-cl-runtime'
     condition: policy-clamp-cl-runtime.enabled
   - name: policy-gui
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/policy-gui'
     condition: policy-gui.enabled
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/portal/Chart.yaml b/kubernetes/portal/Chart.yaml
index fb7d527..16edb6d 100644
--- a/kubernetes/portal/Chart.yaml
+++ b/kubernetes/portal/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Web Portal
 name: portal
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-app/Chart.yaml b/kubernetes/portal/components/portal-app/Chart.yaml
index 83e9847..79449df 100644
--- a/kubernetes/portal/components/portal-app/Chart.yaml
+++ b/kubernetes/portal/components/portal-app/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Portal application
 name: portal-app
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-app/requirements.yaml b/kubernetes/portal/components/portal-app/requirements.yaml
index d49317d..8d18e7f 100644
--- a/kubernetes/portal/components/portal-app/requirements.yaml
+++ b/kubernetes/portal/components/portal-app/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/portal/components/portal-cassandra/Chart.yaml b/kubernetes/portal/components/portal-cassandra/Chart.yaml
index f15479b..0e8762b 100644
--- a/kubernetes/portal/components/portal-cassandra/Chart.yaml
+++ b/kubernetes/portal/components/portal-cassandra/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: Portal cassandra
 name: portal-cassandra
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-cassandra/requirements.yaml b/kubernetes/portal/components/portal-cassandra/requirements.yaml
index 1139b8e..6e32e22 100644
--- a/kubernetes/portal/components/portal-cassandra/requirements.yaml
+++ b/kubernetes/portal/components/portal-cassandra/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/portal/components/portal-mariadb/Chart.yaml b/kubernetes/portal/components/portal-mariadb/Chart.yaml
index 5883b99..a15f9e7 100644
--- a/kubernetes/portal/components/portal-mariadb/Chart.yaml
+++ b/kubernetes/portal/components/portal-mariadb/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: MariaDB Service
 name: portal-mariadb
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-mariadb/requirements.yaml b/kubernetes/portal/components/portal-mariadb/requirements.yaml
index 1139b8e..6e32e22 100644
--- a/kubernetes/portal/components/portal-mariadb/requirements.yaml
+++ b/kubernetes/portal/components/portal-mariadb/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/portal/components/portal-sdk/Chart.yaml b/kubernetes/portal/components/portal-sdk/Chart.yaml
index 11b835d..1119dac 100644
--- a/kubernetes/portal/components/portal-sdk/Chart.yaml
+++ b/kubernetes/portal/components/portal-sdk/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: Portal software development kit
 name: portal-sdk
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-sdk/requirements.yaml b/kubernetes/portal/components/portal-sdk/requirements.yaml
index d49317d..8d18e7f 100644
--- a/kubernetes/portal/components/portal-sdk/requirements.yaml
+++ b/kubernetes/portal/components/portal-sdk/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/portal/components/portal-widget/Chart.yaml b/kubernetes/portal/components/portal-widget/Chart.yaml
index aaac74f..7b0673e 100644
--- a/kubernetes/portal/components/portal-widget/Chart.yaml
+++ b/kubernetes/portal/components/portal-widget/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: Portal widgets micro service application
 name: portal-widget
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/portal/components/portal-widget/requirements.yaml b/kubernetes/portal/components/portal-widget/requirements.yaml
index 1139b8e..6e32e22 100644
--- a/kubernetes/portal/components/portal-widget/requirements.yaml
+++ b/kubernetes/portal/components/portal-widget/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Samsung Electronics
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/portal/requirements.yaml b/kubernetes/portal/requirements.yaml
index 4bca811..2be01cf 100644
--- a/kubernetes/portal/requirements.yaml
+++ b/kubernetes/portal/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,20 +16,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: portal-app
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/portal-app'
   - name: portal-cassandra
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/portal-cassandra'
   - name: portal-mariadb
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/portal-mariadb'
   - name: portal-sdk
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/portal-sdk'
   - name: portal-widget
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/portal-widget'
diff --git a/kubernetes/robot/Chart.yaml b/kubernetes/robot/Chart.yaml
index b456b5b..5e83d1e 100644
--- a/kubernetes/robot/Chart.yaml
+++ b/kubernetes/robot/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: A helm Chart for kubernetes-ONAP Robot
 name: robot
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/robot/requirements.yaml b/kubernetes/robot/requirements.yaml
index 76fdb3f..9f1af30 100644
--- a/kubernetes/robot/requirements.yaml
+++ b/kubernetes/robot/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
index b43bcd9..1b606b8 100644
--- a/kubernetes/sdc/Chart.yaml
+++ b/kubernetes/sdc/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, AT&T, Bell Canada
-# Modifications Copyright © 2018  ZTE
+# Modifications Copyright © 2018 ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: Service Design and Creation Umbrella Helm charts
 name: sdc
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-be/Chart.yaml b/kubernetes/sdc/components/sdc-be/Chart.yaml
index 6b97c3b..03c6378 100644
--- a/kubernetes/sdc/components/sdc-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-be/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Backend API
 name: sdc-be
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-be/requirements.yaml b/kubernetes/sdc/components/sdc-be/requirements.yaml
index b684a0e..dba5be9 100644
--- a/kubernetes/sdc/components/sdc-be/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-be/requirements.yaml
@@ -1,6 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   Modifications Copyright © 2020 AT&T. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
 
 dependencies:
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-cs/Chart.yaml b/kubernetes/sdc/components/sdc-cs/Chart.yaml
index cdddad7..a021f72 100644
--- a/kubernetes/sdc/components/sdc-cs/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-cs/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Cassandra
 name: sdc-cs
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-cs/requirements.yaml b/kubernetes/sdc/components/sdc-cs/requirements.yaml
index 7d9ea04..30d0a22 100644
--- a/kubernetes/sdc/components/sdc-cs/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-cs/requirements.yaml
@@ -1,6 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   Modifications Copyright © 2020 AT&T. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-fe/Chart.yaml b/kubernetes/sdc/components/sdc-fe/Chart.yaml
index 2291ff4..1ea4e36 100644
--- a/kubernetes/sdc/components/sdc-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-fe/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Front End
 name: sdc-fe
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-fe/requirements.yaml b/kubernetes/sdc/components/sdc-fe/requirements.yaml
index b684a0e..dba5be9 100644
--- a/kubernetes/sdc/components/sdc-fe/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-fe/requirements.yaml
@@ -1,6 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   Modifications Copyright © 2020 AT&T. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
 
 dependencies:
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml b/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
index 5af3bf7..b8611a5 100644
--- a/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
@@ -1,5 +1,6 @@
 # ===========LICENSE_START========================================================
 # Copyright (c) 2021 Nokia. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,4 +18,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Helm Validator
 name: sdc-helm-validator
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-helm-validator/requirements.yaml b/kubernetes/sdc/components/sdc-helm-validator/requirements.yaml
index 8e1160a..a935025 100644
--- a/kubernetes/sdc/components/sdc-helm-validator/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-helm-validator/requirements.yaml
@@ -1,5 +1,6 @@
 # ===========LICENSE_START========================================================
 # Copyright (c) 2021 Nokia. All rights reserved.
+# Modifications Copyright © 2021 Orange
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,8 +17,8 @@
 
 dependencies:
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
index 20a8fa4..e6090fc 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Onboarding API
 name: sdc-onboarding-be
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml b/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml
index b684a0e..dba5be9 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml
@@ -1,6 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   Modifications Copyright © 2020 AT&T. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
 
 dependencies:
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
index 93bbf23..9fc2249 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Workflow Designer backend
 name: sdc-wfd-be
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml b/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
index b684a0e..dba5be9 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
@@ -1,6 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   Modifications Copyright © 2020 AT&T. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
 
 dependencies:
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
index ae14eb9..84afef0 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Workflow Designer frontend
 name: sdc-wfd-fe
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml b/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml
index b684a0e..dba5be9 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml
@@ -1,6 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   Modifications Copyright © 2020 AT&T. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,11 +20,11 @@
 
 dependencies:
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/requirements.yaml b/kubernetes/sdc/requirements.yaml
index 1f9b2d1..b9597c3 100644
--- a/kubernetes/sdc/requirements.yaml
+++ b/kubernetes/sdc/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T, ZTE
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,26 +16,26 @@
 
 dependencies:
   - name: sdc-be
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/sdc-be'
   - name: sdc-cs
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/sdc-cs'
   - name: sdc-fe
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/sdc-fe'
   - name: sdc-onboarding-be
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/sdc-onboarding-be'
   - name: sdc-wfd-be
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/sdc-wfd-be'
     condition: sdc-wfd.enabled
   - name: sdc-wfd-fe
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/sdc-wfd-fe'
     condition: sdc-wfd.enabled
   - name: sdc-helm-validator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/sdc-helm-validator'
     condition: sdcHelmValidator.enabled
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index 0d11afc..c75a17c 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: SDN Controller
 name: sdnc
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
index 9c35682..29161ae 100644
--- a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: SDNC DMaaP Listener
 name: dmaap-listener
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml b/kubernetes/sdnc/components/dmaap-listener/requirements.yaml
index 2c0b108..6056f41 100644
--- a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
index 4009467..02447f1 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: SDN-C Ansible Server
 name: sdnc-ansible-server
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml
index 2c0b108..6056f41 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
index 6c81785..f49cbbe 100644
--- a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP SDNC Policy Driven Ownership Management
 name: sdnc-prom
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml
index 1cc295e..0a47ac4 100644
--- a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 Amdocs
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-web/Chart.yaml b/kubernetes/sdnc/components/sdnc-web/Chart.yaml
index 3429793..1482c3b 100644
--- a/kubernetes/sdnc/components/sdnc-web/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 highstreet technologies GmbH
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: SDN-C Web Server
 name: sdnc-web
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/sdnc-web/requirements.yaml b/kubernetes/sdnc/components/sdnc-web/requirements.yaml
index 3d79681..96588e3 100644
--- a/kubernetes/sdnc/components/sdnc-web/requirements.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2020 highstreet technologies GmbH
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdnc/components/ueb-listener/Chart.yaml b/kubernetes/sdnc/components/ueb-listener/Chart.yaml
index ae53f9c..8640743 100644
--- a/kubernetes/sdnc/components/ueb-listener/Chart.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: SDNC UEB Listener
 name: ueb-listener
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sdnc/components/ueb-listener/requirements.yaml b/kubernetes/sdnc/components/ueb-listener/requirements.yaml
index 2c0b108..6056f41 100644
--- a/kubernetes/sdnc/components/ueb-listener/requirements.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml
index f5f6226..58c8e60 100644
--- a/kubernetes/sdnc/requirements.yaml
+++ b/kubernetes/sdnc/requirements.yaml
@@ -2,6 +2,7 @@
 # Copyright © 2017 Amdocs, Bell Canada,
 # Copyright © 2020 highstreet technologies GmbH
 # Copyright © 2021 Nokia
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,57 +17,57 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certManagerCertificate
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: logConfiguration
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: network-name-gen
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: network-name-gen.enabled
   - name: dgbuilder
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: dgbuilder.enabled
   - name: sdnc-prom
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: config.geoEnabled
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: elasticsearch
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: config.sdnr.enabled
   # conditions for sdnc-subcharts
   - name: dmaap-listener
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/dmaap-listener/'
     condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled
   - name: ueb-listener
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/ueb-listener/'
     condition: sdnc.ueb-listener.enabled,ueb-listener.enabled
   - name: sdnc-ansible-server
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/sdnc-ansible-server/'
     condition: sdnc.sdnc-ansible-server.enabled,sdnc-ansible-server.enabled
   - name: sdnc-web
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/sdnc-web/'
     condition: sdnc.sdnc-web.enabled,sdnc-web.enabled
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/sniro-emulator/Chart.yaml b/kubernetes/sniro-emulator/Chart.yaml
index ae5f164..4bbacab 100644
--- a/kubernetes/sniro-emulator/Chart.yaml
+++ b/kubernetes/sniro-emulator/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Mock Sniro Emulator
 name: sniro-emulator
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/sniro-emulator/requirements.yaml b/kubernetes/sniro-emulator/requirements.yaml
index 76fdb3f..9f1af30 100644
--- a/kubernetes/sniro-emulator/requirements.yaml
+++ b/kubernetes/sniro-emulator/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml
index 0aacaf2..94f916f 100755
--- a/kubernetes/so/Chart.yaml
+++ b/kubernetes/so/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
 apiVersion: v1
 description: ONAP Service Orchestrator
 name: so
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-admin-cockpit/Chart.yaml b/kubernetes/so/components/so-admin-cockpit/Chart.yaml
index 2bebdfd..79c5bb8 100644
--- a/kubernetes/so/components/so-admin-cockpit/Chart.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/Chart.yaml
@@ -1,5 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
+#   Modifications Copyright © 2021 Orange
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,4 +20,4 @@
 apiVersion: v1
 description: A Helm chart for ONAP Service Orchestration Monitoring
 name: so-admin-cockpit
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-admin-cockpit/requirements.yaml b/kubernetes/so/components/so-admin-cockpit/requirements.yaml
index 7245266..3120c0f 100755
--- a/kubernetes/so/components/so-admin-cockpit/requirements.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/requirements.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications © 2020 Nokia
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
index d12e318..944b7de 100644
--- a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 AT&T USA
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: A Helm chart for so appc orchestrator
 name: so-appc-orchestrator
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-appc-orchestrator/requirements.yaml b/kubernetes/so/components/so-appc-orchestrator/requirements.yaml
index f8c29f8..19d4cc7 100755
--- a/kubernetes/so/components/so-appc-orchestrator/requirements.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,18 +14,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
-
diff --git a/kubernetes/so/components/so-bpmn-infra/Chart.yaml b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
index 093ecb1..3b439b6 100755
--- a/kubernetes/so/components/so-bpmn-infra/Chart.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 appVersion: "1.0"
 description: A Helm chart for SO Bpmn Infra
 name: so-bpmn-infra
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-bpmn-infra/requirements.yaml b/kubernetes/so/components/so-bpmn-infra/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-bpmn-infra/requirements.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
index f169946..ed640b1 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
 apiVersion: v1
 description: A Helm chart for so-catalog-db-adapter
 name: so-catalog-db-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml b/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-cnf-adapter/Chart.yaml b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
index b61580a..79028c0 100755
--- a/kubernetes/so/components/so-cnf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Huawei Technologies Co., Ltd.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 appVersion: "1.7.1"
 description: A Helm chart for Kubernetes
 name: so-cnf-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-cnf-adapter/requirements.yaml b/kubernetes/so/components/so-cnf-adapter/requirements.yaml
index 6f2b29e..17634f3 100755
--- a/kubernetes/so/components/so-cnf-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,20 +15,20 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
index 0a086b5..c321949 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Nordix Foundation
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP SO ETSI NFVO NS LCM
 name: so-etsi-nfvo-ns-lcm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml
index 421fe7e..19d4cc7 100755
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
index 68519b2..f3435e8 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2019 Nordix Foundation
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
 apiVersion: v1
 description: ONAP SO ETSI SOL003 Adapter
 name: so-etsi-sol003-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml
index 421fe7e..19d4cc7 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
index b178ab5..6c9d1f3 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-etsi-sol005-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-mariadb/Chart.yaml b/kubernetes/so/components/so-mariadb/Chart.yaml
index a39c515..4cc9ff6 100755
--- a/kubernetes/so/components/so-mariadb/Chart.yaml
+++ b/kubernetes/so/components/so-mariadb/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
 apiVersion: v1
 description: MariaDB Service
 name: so-mariadb
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-mariadb/requirements.yaml b/kubernetes/so/components/so-mariadb/requirements.yaml
index b182a70..f5c8b4f 100755
--- a/kubernetes/so/components/so-mariadb/requirements.yaml
+++ b/kubernetes/so/components/so-mariadb/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
index 948c8e2..42173b3 100755
--- a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Huawei Technologies Co., Ltd.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-nssmf-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-nssmf-adapter/requirements.yaml b/kubernetes/so/components/so-nssmf-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-nssmf-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-oof-adapter/Chart.yaml b/kubernetes/so/components/so-oof-adapter/Chart.yaml
index fbdbd3b..807d844 100755
--- a/kubernetes/so/components/so-oof-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-oof-adapter/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +17,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-oof-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-oof-adapter/requirements.yaml b/kubernetes/so/components/so-oof-adapter/requirements.yaml
index 4d6d760..dcff74b 100644
--- a/kubernetes/so/components/so-oof-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-oof-adapter/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Wipro Limited.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,17 +15,17 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-openstack-adapter/Chart.yaml b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
index 88d9cfb..46fc422 100755
--- a/kubernetes/so/components/so-openstack-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-openstack-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-openstack-adapter/requirements.yaml b/kubernetes/so/components/so-openstack-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-openstack-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-request-db-adapter/Chart.yaml b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
index 0798656..c8d573e 100755
--- a/kubernetes/so/components/so-request-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
 apiVersion: v1
 description: A Helm chart for request-db-adapter
 name: so-request-db-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-request-db-adapter/requirements.yaml b/kubernetes/so/components/so-request-db-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-request-db-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-sdc-controller/Chart.yaml b/kubernetes/so/components/so-sdc-controller/Chart.yaml
index fe17976..82b16fb 100755
--- a/kubernetes/so/components/so-sdc-controller/Chart.yaml
+++ b/kubernetes/so/components/so-sdc-controller/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-sdc-controller
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-sdc-controller/requirements.yaml b/kubernetes/so/components/so-sdc-controller/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-sdc-controller/requirements.yaml
+++ b/kubernetes/so/components/so-sdc-controller/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
index 069a0b0..e48406d 100755
--- a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-sdnc-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-sdnc-adapter/requirements.yaml b/kubernetes/so/components/so-sdnc-adapter/requirements.yaml
index 421fe7e..19d4cc7 100755
--- a/kubernetes/so/components/so-sdnc-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
index fb22321..5e7f635 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2020 Samsung
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP SO VE VNFM Adapter (SOL002)
 name: so-ve-vnfm-adapter
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml
index 1ea0239..ad2eb76 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,20 +14,20 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://../soHelpers'
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/soHelpers/Chart.yaml b/kubernetes/so/components/soHelpers/Chart.yaml
index d3cbc8e..3eb4a04 100755
--- a/kubernetes/so/components/soHelpers/Chart.yaml
+++ b/kubernetes/so/components/soHelpers/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018 AT&T USA
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,4 +15,4 @@
 apiVersion: v1
 description: A Helm chart for SO helpers
 name: soHelpers
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/so/components/soHelpers/requirements.yaml b/kubernetes/so/components/soHelpers/requirements.yaml
index eb8b455..8bda2a1 100755
--- a/kubernetes/so/components/soHelpers/requirements.yaml
+++ b/kubernetes/so/components/soHelpers/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/so/requirements.yaml b/kubernetes/so/requirements.yaml
index af95ab8..4c19862 100755
--- a/kubernetes/so/requirements.yaml
+++ b/kubernetes/so/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,87 +14,87 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/soHelpers'
   - name: so-admin-cockpit
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-admin-cockpit'
     condition: so-admin-cockpit.enabled
   - name: so-appc-orchestrator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-appc-orchestrator'
     condition: so-appc-orchestrator.enabled
   - name: so-bpmn-infra
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-bpmn-infra'
   - name: so-catalog-db-adapter
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-catalog-db-adapter'
     condition: so-catalog-db-adapter.enabled
   - name: so-cnf-adapter
-    version: ~8.x-0
+    version: ~9.x-0
     repository: "file://components/so-cnf-adapter"
     condition: so-cnf-adapter.enabled
   - name: so-etsi-nfvo-ns-lcm
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-etsi-nfvo-ns-lcm'
     condition: so-etsi-nfvo-ns-lcm.enabled
   - name: so-etsi-sol003-adapter
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-etsi-sol003-adapter'
     condition: so-etsi-sol003-adapter.enabled
   - name: so-mariadb
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-mariadb'
   - name: so-nssmf-adapter
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-nssmf-adapter'
     condition: so-nssmf-adapter.enabled
   - name: so-oof-adapter
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-oof-adapter'
     condition: so-oof-adapter.enabled
   - name: so-openstack-adapter
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-openstack-adapter'
     condition: so-openstack-adapter.enabled
   - name: so-request-db-adapter
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-request-db-adapter'
   - name: so-sdc-controller
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-sdc-controller'
   - name: so-sdnc-adapter
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-sdnc-adapter'
     condition: so-sdnc-adapter.enabled
   - name: so-ve-vnfm-adapter
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-ve-vnfm-adapter'
     condition: so-ve-vnfm-adapter.enabled
   - name: so-etsi-sol005-adapter
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/so-etsi-sol005-adapter'
     condition: so-etsi-sol005-adapter.enabled
   - name: serviceAccount
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml
index fe69cd4..cd82001 100644
--- a/kubernetes/uui/Chart.yaml
+++ b/kubernetes/uui/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP uui
 name: uui
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/uui/components/uui-server/Chart.yaml b/kubernetes/uui/components/uui-server/Chart.yaml
index f98f231..493ff18 100644
--- a/kubernetes/uui/components/uui-server/Chart.yaml
+++ b/kubernetes/uui/components/uui-server/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP uui server
 name: uui-server
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/uui/requirements.yaml b/kubernetes/uui/requirements.yaml
index a64f0d3..b982291 100644
--- a/kubernetes/uui/requirements.yaml
+++ b/kubernetes/uui/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: uui-server
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/uui-server'
diff --git a/kubernetes/vfc/Chart.yaml b/kubernetes/vfc/Chart.yaml
index 443d00e..d1df26b 100644
--- a/kubernetes/vfc/Chart.yaml
+++ b/kubernetes/vfc/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Virtual Function Controller (VF-C)
 name: vfc
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
index 67461bf..40e3402 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP VFC - Generic VNFM Driver
 name: vfc-generic-vnfm-driver
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
index 690b0c4..305c2e0 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP VFC - Huawei VNFM Driver
 name: vfc-huawei-vnfm-driver
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
index b4fdc3e..d10ff27 100644
--- a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP VFC - NS Life Cycle Management
 name: vfc-nslcm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-redis/Chart.yaml b/kubernetes/vfc/components/vfc-redis/Chart.yaml
index 7155cd7..6334729 100644
--- a/kubernetes/vfc/components/vfc-redis/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-redis/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright (C) 2018 Verizon. All Rights Reserved.
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP VFC - REDIS
 name: vfc-redis
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-redis/requirements.yaml b/kubernetes/vfc/components/vfc-redis/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-redis/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-redis/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
index ddc8a63..d1be70e 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP VFC - VNF Life Cycle Management
 name: vfc-vnflcm
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
index 09136b1..e5d4d1e 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP VFC - VNF Manager
 name: vfc-vnfmgr
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
index 7799bc5..61e9d66 100644
--- a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP VFC - VNF Resource Manager
 name: vfc-vnfres
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
index 741fb0c..ca717c2 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP VFC - ZTE VNFM Driver
 name: vfc-zte-vnfm-driver
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
index bdf33d5..4fecc22 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/requirements.yaml b/kubernetes/vfc/requirements.yaml
index 7f65b02..e404715 100644
--- a/kubernetes/vfc/requirements.yaml
+++ b/kubernetes/vfc/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,44 +15,44 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: vfc-generic-vnfm-driver
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/vfc-generic-vnfm-driver'
     condition: vfc-generic-vnfm-driver.enabled
   - name: vfc-huawei-vnfm-driver
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/vfc-huawei-vnfm-driver'
     condition: vfc-huawei-vnfm-driver.enabled
   - name: vfc-nslcm
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/vfc-nslcm'
     condition: vfc-nslcm.enabled
   - name: vfc-redis
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/vfc-redis'
     condition: vfc-redis.enabled
   - name: vfc-vnflcm
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/vfc-vnflcm'
     condition: vfc-vnflcm.enabled
   - name: vfc-vnfmgr
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/vfc-vnfmgr'
     condition: vfc-vnfmgr.enabled
   - name: vfc-vnfres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/vfc-vnfres'
     condition: vfc-vnfres.enabled
   - name: vfc-zte-vnfm-driver
-    version: ~8.x-0
+    version: ~9.x-0
     repository: 'file://components/vfc-zte-vnfm-driver'
     condition: vfc-zte-vnfm-driver.enabled
diff --git a/kubernetes/vid/Chart.yaml b/kubernetes/vid/Chart.yaml
index f97c844..4791266 100644
--- a/kubernetes/vid/Chart.yaml
+++ b/kubernetes/vid/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP Virtual Infrastructure Deployment
 name: vid
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vid/requirements.yaml b/kubernetes/vid/requirements.yaml
index f26aee0..53d8d69 100644
--- a/kubernetes/vid/requirements.yaml
+++ b/kubernetes/vid/requirements.yaml
@@ -15,22 +15,22 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
diff --git a/kubernetes/vnfsdk/Chart.yaml b/kubernetes/vnfsdk/Chart.yaml
index 0b6bfd9..e73fb16 100644
--- a/kubernetes/vnfsdk/Chart.yaml
+++ b/kubernetes/vnfsdk/Chart.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,4 +16,4 @@
 apiVersion: v1
 description: ONAP VNF SDK
 name: vnfsdk
-version: 8.0.0
+version: 9.0.0
diff --git a/kubernetes/vnfsdk/requirements.yaml b/kubernetes/vnfsdk/requirements.yaml
index 89ddccd..bcdbe2f 100644
--- a/kubernetes/vnfsdk/requirements.yaml
+++ b/kubernetes/vnfsdk/requirements.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2021 Orange
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: postgres
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~8.x-0
+    version: ~9.x-0
     repository: '@local'