diff --git a/docs/hardcoded_certificates.csv b/docs/hardcoded_certificates.csv
index 762956f..fbc7db3 100644
--- a/docs/hardcoded_certificates.csv
+++ b/docs/hardcoded_certificates.csv
@@ -1,7 +1,6 @@
 Project,ONAP Certificate,Own Certificate,MSB Certificate,Path
 AAF,No,Yes,No,aaf/charts/aaf-cert-service/resources/
 AAF,Yes,No,No,aaf/components/aaf-sms/resources/certs/intermediate_root_ca.pem
-AAI,Yes,No,No,aai/oom/resources/config/haproxy/aai.pem
 AAI,Yes,No,No,aai/oom/resources/config/aai/aai_keystore
 AAI/SEARCH-DATA,Yes,No,No,aai/oom/components/aai-search-data/resources/config/auth/tomcat_keystore
 AAI/SPARKY-BE,Yes,No,No,aai/oom/components/aai-spary-be/resources/config/auth/org.onap.aai.p12
@@ -10,23 +9,10 @@
 APPC,Yes,No,No,kubernetes/appc/resources/config/certs/org.onap.appc.keyfile
 APPC,Yes,No,No,kubernetes/appc/resources/config/certs/org.onap.appc.p12
 certInitializer,Yes,No,No,kubernetes/common/certInitializer/resources
-MSB,Yes,No?,Yes,kubernetes/msb/resources/config/certificates
-MUSIC,Yes,No?,No?,kubernetes/common/music/charts/music/resources/keys/
+DMaaP/MR,Yes,No,No,Hardcoded in container
+HOLMES,No,Yes,No,Hardcoded in container
+MULTICLOUD,No,Yes,No,Hardcoded in container
+Robot,Yes,No,No,kubernetes/robot/resources/config/lighttpd/ssl/onap-robot.onap.*
 SDC,Yes,No?,No?,kubernetes/sdc/resources/cert
-SO,Yes,No?,Yes,kubernetes/so/resources/config/certificates
-SO/BPMN,Yes,No?,Yes,kubernetes/so/resources/config/certificates
-SO/Catalog,Yes,No?,Yes,kubernetes/so/resources/config/certificates
-SO/Monitoring,Yes,No?,Yes,kubernetes/so/resources/config/certificates
-SO/OpenStack,Yes,No?,Yes,kubernetes/so/resources/config/certificates
-SO/RequestDb,Yes,No?,Yes,kubernetes/so/resources/config/certificates
-SO/SDC,Yes,No?,Yes,kubernetes/so/resources/config/certificates
-SO/SDNC,Yes,No?,Yes,kubernetes/so/resources/config/certificates
-SO/VE/VNFM,Yes,No?,Yes,kubernetes/so/resources/config/certificates
-SO/VFC,Yes,No?,Yes,kubernetes/so/resources/config/certificates
-SO/VNFM,Yes,No?,Yes,kubernetes/so/resources/config/certificates
-SO/VNFM,No,Yes?,Yes,kubernetes/so/charts/so-secrets/resources/certs/org.onap.so.trust.jks
-VID,No,Yes,No,kubernetes/vid/resources/cert
-OOF/OOF-CMSO,Yes,No,No,kubernetes/oof/charts/oof-cmso/resources/certs
-OOF/OOF-HAS,Yes,No,No,kubernetes/oof/charts/oof-has/resources/config
-OOF/OOF-OSDF,Yes,No,No,kubernetes/oof/resources/config
-CLI,No,Yes,No,kubernetes/cli/resources/certificates
+VID,Yes,No,No,Hardcoded in container
+UUI,No,Yes,No,Hardcoded in container
diff --git a/docs/helm-search.txt b/docs/helm-search.txt
index 774ea34..4d23cc0 100644
--- a/docs/helm-search.txt
+++ b/docs/helm-search.txt
@@ -1,42 +1,42 @@
 NAME                	CHART VERSION	APP VERSION	DESCRIPTION
-local/onap                	7.0.0      Frankfurt  Open Network Automation Platform (ONAP)
-local/aaf                 	7.0.0        	        ONAP Application Authorization Framework
-local/aai                 	7.0.0        	        ONAP Active and Available Inventory
-local/appc                	7.0.0        	        Application Controller
-local/cassandra           	7.0.0        	        ONAP cassandra
-local/cds                 	7.0.0        	        ONAP Controller Design Studio (CDS)
-local/clamp               	7.0.0        	        ONAP Clamp
-local/cli                 	7.0.0        	        ONAP Command Line Interface
-local/common              	7.0.0        	        Common templates for inclusion in other charts
-local/consul              	7.0.0        	        ONAP Consul Agent
-local/contrib             	7.0.0        	        ONAP optional tools
-local/cps                 	7.0.0        	        ONAP Configuration Persistene Service (CPS)
-local/dcaegen2            	7.0.0        	        ONAP DCAE Gen2
-local/dgbuilder           	7.0.0        	        D.G. Builder application
-local/dmaap               	7.0.0        	        ONAP DMaaP components
-local/esr                 	7.0.0        	        ONAP External System Register
-local/log                 	7.0.0        	        ONAP Logging ElasticStack
-local/mariadb-galera      	7.0.0        	        Chart for MariaDB Galera cluster
-local/mongo               	7.0.0        	        MongoDB Server
-local/msb                 	7.0.0        	        ONAP MicroServices Bus
-local/multicloud          	7.0.0        	        ONAP multicloud broker
-local/music               	7.0.0        	        MUSIC - Multi-site State Coordination Service
-local/mysql               	7.0.0        	        MySQL Server
-local/nbi                 	7.0.0        	        ONAP Northbound Interface
-local/network-name-gen    	7.0.0        	        Name Generation Micro Service
-local/nfs-provisioner     	7.0.0        	        NFS provisioner
-local/oof                 	7.0.0        	        ONAP Optimization Framework
-local/policy              	7.0.0        	        ONAP Policy Administration Point
-local/pomba               	7.0.0        	        ONAP Post Orchestration Model Based Audit
-local/portal              	7.0.0        	        ONAP Web Portal
-local/postgres            	7.0.0        	        ONAP Postgres Server
-local/robot               	7.0.0        	        A helm Chart for kubernetes-ONAP Robot
-local/sdc                 	7.0.0        	        Service Design and Creation Umbrella Helm charts
-local/sdnc                	7.0.0        	        SDN Controller
-local/sdnc-prom           	7.0.0        	        ONAP SDNC Policy Driven Ownership Management
-local/sniro-emulator      	7.0.0        	        ONAP Mock Sniro Emulator
-local/so                  	7.0.0        	        ONAP Service Orchestrator
-local/uui                 	7.0.0        	        ONAP uui
-local/vfc                 	7.0.0        	        ONAP Virtual Function Controller (VF-C)
-local/vid                 	7.0.0        	        ONAP Virtual Infrastructure Deployment
-local/vnfsdk              	7.0.0        	        ONAP VNF SDK
+local/onap                	8.0.0      Honolulu   Open Network Automation Platform (ONAP)
+local/aaf                 	8.0.0        	        ONAP Application Authorization Framework
+local/aai                 	8.0.0        	        ONAP Active and Available Inventory
+local/appc                	8.0.0        	        Application Controller
+local/cassandra           	8.0.0        	        ONAP cassandra
+local/cds                 	8.0.0        	        ONAP Controller Design Studio (CDS)
+local/clamp               	8.0.0        	        ONAP Clamp
+local/cli                 	8.0.0        	        ONAP Command Line Interface
+local/common              	8.0.0        	        Common templates for inclusion in other charts
+local/consul              	8.0.0        	        ONAP Consul Agent
+local/contrib             	8.0.0        	        ONAP optional tools
+local/cps                 	8.0.0        	        ONAP Configuration Persistene Service (CPS)
+local/dcaegen2            	8.0.0        	        ONAP DCAE Gen2
+local/dgbuilder           	8.0.0        	        D.G. Builder application
+local/dmaap               	8.0.0        	        ONAP DMaaP components
+local/esr                 	8.0.0        	        ONAP External System Register
+local/log                 	8.0.0        	        ONAP Logging ElasticStack
+local/mariadb-galera      	8.0.0        	        Chart for MariaDB Galera cluster
+local/mongo               	8.0.0        	        MongoDB Server
+local/msb                 	8.0.0        	        ONAP MicroServices Bus
+local/multicloud          	8.0.0        	        ONAP multicloud broker
+local/music               	8.0.0        	        MUSIC - Multi-site State Coordination Service
+local/mysql               	8.0.0        	        MySQL Server
+local/nbi                 	8.0.0        	        ONAP Northbound Interface
+local/network-name-gen    	8.0.0        	        Name Generation Micro Service
+local/nfs-provisioner     	8.0.0        	        NFS provisioner
+local/oof                 	8.0.0        	        ONAP Optimization Framework
+local/policy              	8.0.0        	        ONAP Policy Administration Point
+local/pomba               	8.0.0        	        ONAP Post Orchestration Model Based Audit
+local/portal              	8.0.0        	        ONAP Web Portal
+local/postgres            	8.0.0        	        ONAP Postgres Server
+local/robot               	8.0.0        	        A helm Chart for kubernetes-ONAP Robot
+local/sdc                 	8.0.0        	        Service Design and Creation Umbrella Helm charts
+local/sdnc                	8.0.0        	        SDN Controller
+local/sdnc-prom           	8.0.0        	        ONAP SDNC Policy Driven Ownership Management
+local/sniro-emulator      	8.0.0        	        ONAP Mock Sniro Emulator
+local/so                  	8.0.0        	        ONAP Service Orchestrator
+local/uui                 	8.0.0        	        ONAP uui
+local/vfc                 	8.0.0        	        ONAP Virtual Function Controller (VF-C)
+local/vid                 	8.0.0        	        ONAP Virtual Infrastructure Deployment
+local/vnfsdk              	8.0.0        	        ONAP VNF SDK
diff --git a/docs/index.rst b/docs/index.rst
index 639e069..89f9474 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -12,9 +12,7 @@
 
   oom_project_description.rst
   oom_quickstart_guide.rst
-  oom_quickstart_guide_helm3.rst
   oom_user_guide.rst
-  oom_user_guide_helm3.rst
   oom_setup_paas.rst
   oom_developer_guide.rst
   oom_cloud_setup_guide.rst
diff --git a/docs/oom_cloud_setup_guide.rst b/docs/oom_cloud_setup_guide.rst
index e54992e..8431cf7 100644
--- a/docs/oom_cloud_setup_guide.rst
+++ b/docs/oom_cloud_setup_guide.rst
@@ -56,6 +56,7 @@
   el alto            1.15.2       2.14.2   1.15.2    18.09.x
   frankfurt          1.15.9       2.16.6   1.15.11   18.09.x
   guilin             1.15.11      2.16.10  1.15.11   18.09.x
+  Honolulu           1.19.9       3.5.2    1.19.9    19.03.x
   ==============     ===========  =======  ========  ========
 
 .. note::
diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index 2c1e48e..5136e53 100644
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -26,13 +26,20 @@
 * 5.0.1-ONAP for El Alto
 * 6.0.0 for Frankfurt
 * 7.0.0 for Guilin
+* 8.0.0 for Honolulu
 
 **Step 2.** Install Helm Plugins required to deploy ONAP::
 
-  > sudo cp -R ~/oom/kubernetes/helm/plugins/ ~/.helm
+  > cp -R ~/oom/kubernetes/helm/plugins/ ~/.local/share/helm/plugins
+  > helm plugin install https://github.com/chartmuseum/helm-push.git
 
+**Step 3** Install Chartmuseum::
 
-**Step 3.** Customize the Helm charts like `oom/kubernetes/onap/values.yaml` or
+  > curl -LO https://s3.amazonaws.com/chartmuseum/release/latest/bin/linux/amd64/chartmuseum
+  > chmod +x ./chartmuseum
+  > mv ./chartmuseum /usr/local/bin
+
+**Step 4.** Customize the Helm charts like `oom/kubernetes/onap/values.yaml` or
 an override file like `onap-all.yaml`, `onap-vfw.yaml` or `openstack.yaml` file
 to suit your deployment with items like the OpenStack tenant information.
 
@@ -78,8 +85,6 @@
     cd so/resources/config/mso/
     /oom/kubernetes/so/resources/config/mso# echo -n "<openstack tenant password>" | openssl aes-128-ecb -e -K `cat encryption.key` -nosalt | xxd -c 256 -p``
 
-  Use OS_PASSWORD value from openstack .RC file for "openstack tenant password"
-
 c. Generating SO Encrypted Password:
 The SO Encrypted Password uses a java based encryption utility since the
 Java encryption library is not easy to integrate with openssl/python that
@@ -89,7 +94,7 @@
   To generate SO ``openStackEncryptedPasswordHere`` and ``openStackSoEncryptedPassword``
   ensure `default-jdk` is installed::
 
-    sudo apt-get update; sudo apt-get install default-jdk
+    apt-get update; apt-get install default-jdk
 
   Then execute::
 
@@ -132,10 +137,6 @@
   deployment need not worry about this setting but for the demonstration VNFs
   the ip asssignment strategy assumes 10.0 ip prefix.
 
-.. note::
-  Copy below required openstack.yaml file and update the parameters for the variables
-  accordingly from openstack environment (openrc file) and replace
-
 Example Keystone v2.0
 
 .. literalinclude:: example-integration-override.yaml
@@ -147,33 +148,33 @@
    :language: yaml
 
 
-**Step 4.** To setup a local Helm server to server up the ONAP charts::
+**Step 5.** To setup a local Helm server to server up the ONAP charts::
 
-  > helm serve &
+  > chartmuseum --storage local --storage-local-rootdir ~/helm3-storage -port 8879 &
 
 Note the port number that is listed and use it in the Helm repo add as
 follows::
 
   > helm repo add local http://127.0.0.1:8879
 
-**Step 5.** Verify your Helm repository setup with::
+**Step 6.** Verify your Helm repository setup with::
 
   > helm repo list
   NAME   URL
   local  http://127.0.0.1:8879
 
-**Step 6.** Build a local Helm repository (from the kubernetes directory)::
+**Step 7.** Build a local Helm repository (from the kubernetes directory)::
 
-  > make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all
+  > make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all ; make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] onap
 
 `HELM_BIN`
-  Sets the helm binary to be used. The default value use helm from PATH. Allow
-  the user to have multiple version of helm in operating system and choose
-  which one to use.
+  Sets the helm binary to be used. The default value use helm from PATH
 
-**Step 7.** Display the onap charts that available to be deployed::
 
-  > helm search onap -l
+**Step 8.** Display the onap charts that available to be deployed::
+
+  > helm repo update
+  > helm search repo onap
 
 .. literalinclude:: helm-search.txt
 
@@ -182,13 +183,14 @@
   to your deployment charts or values be sure to use ``make`` to update your
   local Helm repository.
 
-**Step 8.** Once the repo is setup, installation of ONAP can be done with a
+**Step 9.** Once the repo is setup, installation of ONAP can be done with a
 single command
 
 .. note::
-  The ``--timeout 900`` is currently required in Guilin and up to address long
-  running initialization tasks for DMaaP and SO. Without this timeout value both
-  applications may fail to deploy.
+  The ``--timeout 900s`` is currently required in Dublin and later
+  versions up to address long running initialization tasks for DMaaP
+  and SO. Without this timeout value both applications may fail to
+  deploy.
 
 .. danger::
   We've added the master password on the command line.
@@ -202,7 +204,7 @@
 To deploy all ONAP applications use this command::
 
     > cd oom/kubernetes
-    >  helm deploy dev local/onap --namespace onap --set global.masterPassword=myAwesomePasswordThatINeedToChange -f onap/resources/overrides/onap-all.yaml -f onap/resources/overrides/environment.yaml -f onap/resources/overrides/openstack.yaml --timeout 900
+    >  helm deploy dev local/onap --namespace onap --create-namespace --set global.masterPassword=myAwesomePasswordThatINeedToChange -f onap/resources/overrides/onap-all.yaml -f onap/resources/overrides/environment.yaml -f onap/resources/overrides/openstack.yaml --timeout 900s
 
 All override files may be customized (or replaced by other overrides) as per
 needs.
@@ -229,7 +231,7 @@
   you want to use to deploy VNFs from ONAP and/or additional parameters for the
   embedded tests.
 
-**Step 9.** Verify ONAP installation
+**Step 10.** Verify ONAP installation
 
 Use the following to monitor your deployment and determine when ONAP is ready
 for use::
@@ -243,26 +245,9 @@
 
     > ~/oom/kubernetes/robot/ete-k8s.sh onap health
 
-  Launch Robot distribute health checks to verify whether ONAP runtime components are healthy::
-
-    > ~/oom/kubernetes/robot/ete-k8s.sh onap healthdist
-
-**Step 10.** Undeploy ONAP
+**Step 11.** Undeploy ONAP
 ::
 
-  > helm undeploy dev --purge
-
-.. note::
-  After undeploy follow the below steps to cleanup everything before redeplying ONAP
-
-::
-
-  > kubectl delete namespace onap
-
-  > kubectl delete pv -n onap --all
-
-  > kubectl delete pvc -n onap --all
-
-  > sudo rm -rf /dockerdata-nfs/*
+  > helm undeploy dev
 
 More examples of using the deploy and undeploy plugins can be found here: https://wiki.onap.org/display/DW/OOM+Helm+%28un%29Deploy+plugins
diff --git a/docs/oom_quickstart_guide_helm3.rst b/docs/oom_quickstart_guide_helm3.rst
deleted file mode 100644
index e4d4736..0000000
--- a/docs/oom_quickstart_guide_helm3.rst
+++ /dev/null
@@ -1,252 +0,0 @@
-.. This work is licensed under a
-.. Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. Copyright 2019-2020 Amdocs, Bell Canada, Orange, Samsung
-.. _oom_quickstart_guide_helm3:
-.. _quick-start-label-helm3:
-
-OOM Quick Start Guide Helm3 (experimental)
-###########################################
-
-.. figure:: oomLogoV2-medium.png
-   :align: right
-
-Once a Kubernetes environment is available (follow the instructions in
-:ref:`cloud-setup-guide-label` if you don't have a cloud environment
-available), follow the following instructions to deploy ONAP.
-
-**Step 1.** Clone the OOM repository from ONAP gerrit::
-
-  > git clone -b <BRANCH> http://gerrit.onap.org/r/oom --recurse-submodules
-  > cd oom/kubernetes
-
-where <BRANCH> can be an official release tag, such as
-
-* 4.0.0-ONAP for Dublin
-* 5.0.1-ONAP for El Alto
-* 6.0.0 for Frankfurt
-* 7.0.0 for Guilin
-
-**Step 2.** Install Helm Plugins required to deploy ONAP::
-
-  > cp -R ~/oom/kubernetes/helm/plugins/ ~/.local/share/helm/plugins
-  > helm plugin install https://github.com/chartmuseum/helm-push.git
-
-**Step 3** Install Chartmuseum::
-
-  > curl -LO https://s3.amazonaws.com/chartmuseum/release/latest/bin/linux/amd64/chartmuseum
-  > chmod +x ./chartmuseum
-  > mv ./chartmuseum /usr/local/bin
-
-**Step 4.** Customize the Helm charts like `oom/kubernetes/onap/values.yaml` or
-an override file like `onap-all.yaml`, `onap-vfw.yaml` or `openstack.yaml` file
-to suit your deployment with items like the OpenStack tenant information.
-
-.. note::
-  Standard and example override files (e.g. `onap-all.yaml`, `openstack.yaml`) can be found in
-  the `oom/kubernetes/onap/resources/overrides/` directory.
-
-
- a. You may want to selectively enable or disable ONAP components by changing
-    the ``enabled: true/false`` flags.
-
-
- b. Encrypt the OpenStack password using the shell tool for Robot and put it in
-    the Robot Helm charts or Robot section of `openstack.yaml`
-
-
- c. Encrypt the OpenStack password using the java based script for SO Helm charts
-    or SO section of `openstack.yaml`.
-
-
- d. Update the OpenStack parameters that will be used by Robot, SO and APPC Helm
-    charts or use an override file to replace them.
-
- e. Add in the command line a value for the global master password (global.masterPassword).
-
-
-
-a. Enabling/Disabling Components:
-Here is an example of the nominal entries that need to be provided.
-We have different values file available for different contexts.
-
-.. literalinclude:: ../kubernetes/onap/values.yaml
-   :language: yaml
-
-
-b. Generating ROBOT Encrypted Password:
-The Robot encrypted Password uses the same encryption.key as SO but an
-openssl algorithm that works with the python based Robot Framework.
-
-.. note::
-  To generate Robot ``openStackEncryptedPasswordHere``::
-
-    cd so/resources/config/mso/
-    /oom/kubernetes/so/resources/config/mso# echo -n "<openstack tenant password>" | openssl aes-128-ecb -e -K `cat encryption.key` -nosalt | xxd -c 256 -p``
-
-c. Generating SO Encrypted Password:
-The SO Encrypted Password uses a java based encryption utility since the
-Java encryption library is not easy to integrate with openssl/python that
-Robot uses in Dublin and upper versions.
-
-.. note::
-  To generate SO ``openStackEncryptedPasswordHere`` and ``openStackSoEncryptedPassword``
-  ensure `default-jdk` is installed::
-
-    apt-get update; apt-get install default-jdk
-
-  Then execute::
-
-    SO_ENCRYPTION_KEY=`cat ~/oom/kubernetes/so/resources/config/mso/encryption.key`
-    OS_PASSWORD=XXXX_OS_CLEARTESTPASSWORD_XXXX
-
-    git clone http://gerrit.onap.org/r/integration
-    cd integration/deployment/heat/onap-rke/scripts
-
-    javac Crypto.java
-    java Crypto "$OS_PASSWORD" "$SO_ENCRYPTION_KEY"
-
-d. Update the OpenStack parameters:
-
-There are assumptions in the demonstration VNF Heat templates about the
-networking available in the environment. To get the most value out of these
-templates and the automation that can help confirm the setup is correct, please
-observe the following constraints.
-
-
-``openStackPublicNetId:``
-  This network should allow Heat templates to add interfaces.
-  This need not be an external network, floating IPs can be assigned to the
-  ports on the VMs that are created by the heat template but its important that
-  neutron allow ports to be created on them.
-
-``openStackPrivateNetCidr: "10.0.0.0/16"``
-  This ip address block is used to assign OA&M addresses on VNFs to allow ONAP
-  connectivity. The demonstration Heat templates assume that 10.0 prefix can be
-  used by the VNFs and the demonstration ip addressing plan embodied in the
-  preload template prevent conflicts when instantiating the various VNFs. If
-  you need to change this, you will need to modify the preload data in the
-  Robot Helm chart like integration_preload_parameters.py and the
-  demo/heat/preload_data in the Robot container. The size of the CIDR should
-  be sufficient for ONAP and the VMs you expect to create.
-
-``openStackOamNetworkCidrPrefix: "10.0"``
-  This ip prefix mush match the openStackPrivateNetCidr and is a helper
-  variable to some of the Robot scripts for demonstration. A production
-  deployment need not worry about this setting but for the demonstration VNFs
-  the ip asssignment strategy assumes 10.0 ip prefix.
-
-Example Keystone v2.0
-
-.. literalinclude:: example-integration-override.yaml
-   :language: yaml
-
-Example Keystone v3  (required for Rocky and later releases)
-
-.. literalinclude:: example-integration-override-v3.yaml
-   :language: yaml
-
-
-**Step 5.** To setup a local Helm server to server up the ONAP charts::
-
-  > chartmuseum --storage local --storage-local-rootdir ~/helm3-storage -port 8879 &
-
-Note the port number that is listed and use it in the Helm repo add as
-follows::
-
-  > helm repo add local http://127.0.0.1:8879
-
-**Step 6.** Verify your Helm repository setup with::
-
-  > helm repo list
-  NAME   URL
-  local  http://127.0.0.1:8879
-
-**Step 7.** Build a local Helm repository (from the kubernetes directory)::
-
-  > make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all ; make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] onap
-
-`HELM_BIN`
-  Sets the helm binary to be used. The default value use helm from PATH
-
-
-**Step 8.** Display the onap charts that available to be deployed::
-
-  > helm repo update
-  > helm search repo onap
-
-.. literalinclude:: helm-search.txt
-
-.. note::
-  The setup of the Helm repository is a one time activity. If you make changes
-  to your deployment charts or values be sure to use ``make`` to update your
-  local Helm repository.
-
-**Step 9.** Once the repo is setup, installation of ONAP can be done with a
-single command
-
-.. note::
-  The ``--timeout 900s`` is currently required in Dublin and later
-  versions up to address long running initialization tasks for DMaaP
-  and SO. Without this timeout value both applications may fail to
-  deploy.
-
-.. danger::
-  We've added the master password on the command line.
-  You shouldn't put it in a file for safety reason
-  please don't forget to change the value to something random
-
-  A space is also added in front of the command so "history" doesn't catch it.
-  This masterPassword is very sensitive, please be careful!
-
-
-To deploy all ONAP applications use this command::
-
-    > cd oom/kubernetes
-    >  helm deploy dev local/onap --namespace onap --create-namespace --set global.masterPassword=myAwesomePasswordThatINeedToChange -f onap/resources/overrides/onap-all.yaml -f onap/resources/overrides/environment.yaml -f onap/resources/overrides/openstack.yaml --timeout 900s
-
-All override files may be customized (or replaced by other overrides) as per
-needs.
-
-`onap-all.yaml`
-  Enables the modules in the ONAP deployment. As ONAP is very modular, it is
-  possible to customize ONAP and disable some components through this
-  configuration file.
-
-`onap-all-ingress-nginx-vhost.yaml`
-  Alternative version of the `onap-all.yaml` but with global ingress controller
-  enabled. It requires the cluster configured with the nginx ingress controller
-  and load balancer. Please use this file instead `onap-all.yaml` if you want
-  to use experimental ingress controller feature.
-
-`environment.yaml`
-  Includes configuration values specific to the deployment environment.
-
-  Example: adapt readiness and liveness timers to the level of performance of
-  your infrastructure
-
-`openstack.yaml`
-  Includes all the OpenStack related information for the default target tenant
-  you want to use to deploy VNFs from ONAP and/or additional parameters for the
-  embedded tests.
-
-**Step 10.** Verify ONAP installation
-
-Use the following to monitor your deployment and determine when ONAP is ready
-for use::
-
-  > kubectl get pods -n onap -o=wide
-
-.. note::
-  While all pods may be in a Running state, it is not a guarantee that all components are running fine.
-
-  Launch the healthcheck tests using Robot to verify that the components are healthy::
-
-    > ~/oom/kubernetes/robot/ete-k8s.sh onap health
-
-**Step 11.** Undeploy ONAP
-::
-
-  > helm undeploy dev
-
-More examples of using the deploy and undeploy plugins can be found here: https://wiki.onap.org/display/DW/OOM+Helm+%28un%29Deploy+plugins
diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst
index 3743f5b..df9c841 100644
--- a/docs/oom_user_guide.rst
+++ b/docs/oom_user_guide.rst
@@ -13,11 +13,10 @@
 .. _Helm: https://docs.helm.sh/
 .. _Kubernetes: https://Kubernetes.io/
 .. _Kubernetes LoadBalancer: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
-.. _`Docker installation guide`: https://docs.docker.com/engine/install/
 .. _user-guide-label:
 
-OOM User Guide
-##############
+OOM User Guide helm3 (experimental)
+###################################
 
 The ONAP Operations Manager (OOM) provide the ability to manage the entire
 life-cycle of an ONAP installation, from the initial deployment to final
@@ -56,12 +55,8 @@
 
 Pre-requisites
 --------------
-Your environment must have Docker installed as well as both the Kubernetes
-`kubectl` and Helm setup as a one time activity.
-
-Install Docker
-~~~~~~~~~~~~~~
-Follow official `Docker installation guide`_.
+Your environment must have both the Kubernetes `kubectl` and Helm setup as a
+one time activity.
 
 Install Kubectl
 ~~~~~~~~~~~~~~~
@@ -88,18 +83,14 @@
 Helm is used by OOM for package and configuration management. To install Helm,
 enter the following::
 
-  > wget http://storage.googleapis.com/kubernetes-helm/helm-v2.9.1-linux-amd64.tar.gz
-  > tar -zxvf helm-v2.9.1-linux-amd64.tar.gz
+  > wget https://get.helm.sh/helm-v3.5.2-linux-amd64.tar.gz
+  > tar -zxvf helm-v3.5.2-linux-amd64.tar.gz
   > sudo mv linux-amd64/helm /usr/local/bin/helm
 
 Verify the Helm version with::
 
   > helm version
 
-Install the Helm Tiller application and initialize with::
-
-  > helm init
-
 Install the Helm Repo
 ---------------------
 Once kubectl and Helm are setup, one needs to setup a local Helm server to
@@ -122,14 +113,20 @@
 
 To prepare your system for an installation of ONAP, you'll need to::
 
-  > git clone -b frankfurt --recurse-submodules -j2 http://gerrit.onap.org/r/oom
+  > git clone -b guilin --recurse-submodules -j2 http://gerrit.onap.org/r/oom
   > cd oom/kubernetes
 
 
+To install a local Helm server::
+
+  > curl -LO https://s3.amazonaws.com/chartmuseum/release/latest/bin/linux/amd64/chartmuseum
+  > chmod +x ./chartmuseum
+  > mv ./chartmuseum /usr/local/bin
+
 To setup a local Helm server to server up the ONAP charts::
 
-  > helm init
-  > helm serve &
+  > mkdir -p ~/helm3-storage
+  > chartmuseum --storage local --storage-local-rootdir ~/helm3-storage -port 8879 &
 
 Note the port number that is listed and use it in the Helm repo add as
 follows::
@@ -147,27 +144,25 @@
   > make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all
 
 `HELM_BIN`
-  Sets the helm binary to be used. The default value use helm from PATH.
-  Allow the user to have multiple version of helm in operating system and
-  choose which one to use.
+  Sets the helm binary to be used. The default value use helm from PATH
 
 The Helm search command reads through all of the repositories configured on the
 system, and looks for matches::
 
-  > helm search -l
+  > helm search repo local
   NAME                    VERSION    DESCRIPTION
-  local/appc              7.0.0      Application Controller
-  local/clamp             7.0.0      ONAP Clamp
-  local/common            7.0.0      Common templates for inclusion in other charts
-  local/onap              7.0.0      Open Network Automation Platform (ONAP)
-  local/robot             7.0.0      A helm Chart for kubernetes-ONAP Robot
-  local/so                7.0.0      ONAP Service Orchestrator
+  local/appc              2.0.0      Application Controller
+  local/clamp             2.0.0      ONAP Clamp
+  local/common            2.0.0      Common templates for inclusion in other charts
+  local/onap              2.0.0      Open Network Automation Platform (ONAP)
+  local/robot             2.0.0      A helm Chart for kubernetes-ONAP Robot
+  local/so                2.0.0      ONAP Service Orchestrator
 
 In any case, setup of the Helm repository is a one time activity.
 
 Next, install Helm Plugins required to deploy the ONAP Casablanca release::
 
-  > cp -R helm/plugins/ ~/.helm
+  > cp -R ~/oom/kubernetes/helm/plugins/ ~/.local/share/helm/plugins
 
 Once the repo is setup, installation of ONAP can be done with a single
 command::
@@ -720,13 +715,13 @@
 deployment.
 To completely delete a release and remove it from the internal store enter::
 
-  > helm undeploy onap --purge
+  > helm undeploy onap
 
 One can also remove individual components from a deployment by changing the
 ONAP configuration values.  For example, to remove `so` from a running
 deployment enter::
 
-  > helm undeploy onap-so --purge
+  > helm undeploy onap-so
 
 will remove `so` as the configuration indicates it's no longer part of the
 deployment. This might be useful if a one wanted to replace just `so` by
diff --git a/docs/oom_user_guide_helm3.rst b/docs/oom_user_guide_helm3.rst
deleted file mode 100644
index 2c1eeab..0000000
--- a/docs/oom_user_guide_helm3.rst
+++ /dev/null
@@ -1,728 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0
-.. International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. Copyright 2018-2020 Amdocs, Bell Canada, Orange, Samsung
-.. _oom_user_guide:
-
-.. Links
-.. _Curated applications for Kubernetes: https://github.com/kubernetes/charts
-.. _Services: https://kubernetes.io/docs/concepts/services-networking/service/
-.. _ReplicaSet: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
-.. _StatefulSet: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/
-.. _Helm Documentation: https://docs.helm.sh/helm/
-.. _Helm: https://docs.helm.sh/
-.. _Kubernetes: https://Kubernetes.io/
-.. _Kubernetes LoadBalancer: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
-.. _oom_user_guide_helm3:
-
-OOM User Guide helm3 (experimental)
-###################################
-
-The ONAP Operations Manager (OOM) provide the ability to manage the entire
-life-cycle of an ONAP installation, from the initial deployment to final
-decommissioning. This guide provides instructions for users of ONAP to
-use the Kubernetes_/Helm_ system as a complete ONAP management system.
-
-This guide provides many examples of Helm command line operations.  For a
-complete description of these commands please refer to the `Helm
-Documentation`_.
-
-.. figure:: oomLogoV2-medium.png
-   :align: right
-
-The following sections describe the life-cycle operations:
-
-- Deploy_ - with built-in component dependency management
-- Configure_ - unified configuration across all ONAP components
-- Monitor_ - real-time health monitoring feeding to a Consul UI and Kubernetes
-- Heal_- failed ONAP containers are recreated automatically
-- Scale_ - cluster ONAP services to enable seamless scaling
-- Upgrade_ - change-out containers or configuration with little or no service
-  impact
-- Delete_ - cleanup individual containers or entire deployments
-
-.. figure:: oomLogoV2-Deploy.png
-   :align: right
-
-Deploy
-======
-
-The OOM team with assistance from the ONAP project teams, have built a
-comprehensive set of Helm charts, yaml files very similar to TOSCA files, that
-describe the composition of each of the ONAP components and the relationship
-within and between components. Using this model Helm is able to deploy all of
-ONAP with a few simple commands.
-
-Pre-requisites
---------------
-Your environment must have both the Kubernetes `kubectl` and Helm setup as a
-one time activity.
-
-Install Kubectl
-~~~~~~~~~~~~~~~
-Enter the following to install kubectl (on Ubuntu, there are slight differences
-on other O/Ss), the Kubernetes command line interface used to manage a
-Kubernetes cluster::
-
-  > curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.8.10/bin/linux/amd64/kubectl
-  > chmod +x ./kubectl
-  > sudo mv ./kubectl /usr/local/bin/kubectl
-  > mkdir ~/.kube
-
-Paste kubectl config from Rancher (see the :ref:`cloud-setup-guide-label` for
-alternative Kubernetes environment setups) into the `~/.kube/config` file.
-
-Verify that the Kubernetes config is correct::
-
-  > kubectl get pods --all-namespaces
-
-At this point you should see six Kubernetes pods running.
-
-Install Helm
-~~~~~~~~~~~~
-Helm is used by OOM for package and configuration management. To install Helm,
-enter the following::
-
-  > wget https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz
-  > tar -zxvf helm-v3.3.4-linux-amd64.tar.gz
-  > sudo mv linux-amd64/helm /usr/local/bin/helm
-
-Verify the Helm version with::
-
-  > helm version
-
-Install the Helm Repo
----------------------
-Once kubectl and Helm are setup, one needs to setup a local Helm server to
-server up the ONAP charts::
-
-  > helm install osn/onap
-
-.. note::
-  The osn repo is not currently available so creation of a local repository is
-  required.
-
-Helm is able to use charts served up from a repository and comes setup with a
-default CNCF provided `Curated applications for Kubernetes`_ repository called
-stable which should be removed to avoid confusion::
-
-  > helm repo remove stable
-
-.. To setup the Open Source Networking Nexus repository for helm enter::
-..  > helm repo add osn 'https://nexus3.onap.org:10001/helm/helm-repo-in-nexus/master/'
-
-To prepare your system for an installation of ONAP, you'll need to::
-
-  > git clone -b guilin --recurse-submodules -j2 http://gerrit.onap.org/r/oom
-  > cd oom/kubernetes
-
-
-To install a local Helm server::
-
-  > curl -LO https://s3.amazonaws.com/chartmuseum/release/latest/bin/linux/amd64/chartmuseum
-  > chmod +x ./chartmuseum
-  > mv ./chartmuseum /usr/local/bin
-
-To setup a local Helm server to server up the ONAP charts::
-
-  > mkdir -p ~/helm3-storage
-  > chartmuseum --storage local --storage-local-rootdir ~/helm3-storage -port 8879 &
-
-Note the port number that is listed and use it in the Helm repo add as
-follows::
-
-  > helm repo add local http://127.0.0.1:8879
-
-To get a list of all of the available Helm chart repositories::
-
-  > helm repo list
-  NAME   URL
-  local  http://127.0.0.1:8879
-
-Then build your local Helm repository::
-
-  > make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all
-
-`HELM_BIN`
-  Sets the helm binary to be used. The default value use helm from PATH
-
-The Helm search command reads through all of the repositories configured on the
-system, and looks for matches::
-
-  > helm search repo local
-  NAME                    VERSION    DESCRIPTION
-  local/appc              2.0.0      Application Controller
-  local/clamp             2.0.0      ONAP Clamp
-  local/common            2.0.0      Common templates for inclusion in other charts
-  local/onap              2.0.0      Open Network Automation Platform (ONAP)
-  local/robot             2.0.0      A helm Chart for kubernetes-ONAP Robot
-  local/so                2.0.0      ONAP Service Orchestrator
-
-In any case, setup of the Helm repository is a one time activity.
-
-Next, install Helm Plugins required to deploy the ONAP Casablanca release::
-
-  > cp -R ~/oom/kubernetes/helm/plugins/ ~/.local/share/helm/plugins
-
-Once the repo is setup, installation of ONAP can be done with a single
-command::
-
-  > helm deploy development local/onap --namespace onap
-
-This will install ONAP from a local repository in a 'development' Helm release.
-As described below, to override the default configuration values provided by
-OOM, an environment file can be provided on the command line as follows::
-
-  > helm deploy development local/onap --namespace onap -f overrides.yaml
-
-To get a summary of the status of all of the pods (containers) running in your
-deployment::
-
-  > kubectl get pods --all-namespaces -o=wide
-
-.. note::
-  The Kubernetes namespace concept allows for multiple instances of a component
-  (such as all of ONAP) to co-exist with other components in the same
-  Kubernetes cluster by isolating them entirely.  Namespaces share only the
-  hosts that form the cluster thus providing isolation between production and
-  development systems as an example.  The OOM deployment of ONAP in Beijing is
-  now done within a single Kubernetes namespace where in Amsterdam a namespace
-  was created for each of the ONAP components.
-
-.. note::
-  The Helm `--name` option refers to a release name and not a Kubernetes namespace.
-
-
-To install a specific version of a single ONAP component (`so` in this example)
-with the given release name enter::
-
-  > helm deploy so onap/so --version 3.0.1
-
-To display details of a specific resource or group of resources type::
-
-  > kubectl describe pod so-1071802958-6twbl
-
-where the pod identifier refers to the auto-generated pod identifier.
-
-.. figure:: oomLogoV2-Configure.png
-   :align: right
-
-Configure
-=========
-
-Each project within ONAP has its own configuration data generally consisting
-of: environment variables, configuration files, and database initial values.
-Many technologies are used across the projects resulting in significant
-operational complexity and an inability to apply global parameters across the
-entire ONAP deployment. OOM solves this problem by introducing a common
-configuration technology, Helm charts, that provide a hierarchical
-configuration with the ability to override values with higher
-level charts or command line options.
-
-The structure of the configuration of ONAP is shown in the following diagram.
-Note that key/value pairs of a parent will always take precedence over those
-of a child. Also note that values set on the command line have the highest
-precedence of all.
-
-.. graphviz::
-
-   digraph config {
-      {
-         node     [shape=folder]
-         oValues  [label="values.yaml"]
-         demo     [label="onap-demo.yaml"]
-         prod     [label="onap-production.yaml"]
-         oReq     [label="requirements.yaml"]
-         soValues [label="values.yaml"]
-         soReq    [label="requirements.yaml"]
-         mdValues [label="values.yaml"]
-      }
-      {
-         oResources  [label="resources"]
-      }
-      onap -> oResources
-      onap -> oValues
-      oResources -> environments
-      oResources -> oReq
-      oReq -> so
-      environments -> demo
-      environments -> prod
-      so -> soValues
-      so -> soReq
-      so -> charts
-      charts -> mariadb
-      mariadb -> mdValues
-
-   }
-
-The top level onap/values.yaml file contains the values required to be set
-before deploying ONAP.  Here is the contents of this file:
-
-.. include:: ../kubernetes/onap/values.yaml
-   :code: yaml
-
-One may wish to create a value file that is specific to a given deployment such
-that it can be differentiated from other deployments.  For example, a
-onap-development.yaml file may create a minimal environment for development
-while onap-production.yaml might describe a production deployment that operates
-independently of the developer version.
-
-For example, if the production OpenStack instance was different from a
-developer's instance, the onap-production.yaml file may contain a different
-value for the vnfDeployment/openstack/oam_network_cidr key as shown below.
-
-.. code-block:: yaml
-
-  nsPrefix: onap
-  nodePortPrefix: 302
-  apps: consul msb mso message-router sdnc vid robot portal policy appc aai
-  sdc dcaegen2 log cli multicloud clamp vnfsdk aaf kube2msb
-  dataRootDir: /dockerdata-nfs
-
-  # docker repositories
-  repository:
-    onap: nexus3.onap.org:10001
-    oom: oomk8s
-    aai: aaionap
-    filebeat: docker.elastic.co
-
-  image:
-    pullPolicy: Never
-
-  # vnf deployment environment
-  vnfDeployment:
-    openstack:
-      ubuntu_14_image: "Ubuntu_14.04.5_LTS"
-      public_net_id: "e8f51956-00dd-4425-af36-045716781ffc"
-      oam_network_id: "d4769dfb-c9e4-4f72-b3d6-1d18f4ac4ee6"
-      oam_subnet_id: "191f7580-acf6-4c2b-8ec0-ba7d99b3bc4e"
-      oam_network_cidr: "192.168.30.0/24"
-  <...>
-
-
-To deploy ONAP with this environment file, enter::
-
-  > helm deploy local/onap -n onap -f environments/onap-production.yaml
-
-.. include:: environments_onap_demo.yaml
-   :code: yaml
-
-When deploying all of ONAP a requirements.yaml file control which and what
-version of the ONAP components are included.  Here is an excerpt of this
-file:
-
-.. code-block:: yaml
-
-  # Referencing a named repo called 'local'.
-  # Can add this repo by running commands like:
-  # > helm serve
-  # > helm repo add local http://127.0.0.1:8879
-  dependencies:
-  <...>
-    - name: so
-      version: ~2.0.0
-      repository: '@local'
-      condition: so.enabled
-  <...>
-
-The ~ operator in the `so` version value indicates that the latest "2.X.X"
-version of `so` shall be used thus allowing the chart to allow for minor
-upgrades that don't impact the so API; hence, version 2.0.1 will be installed
-in this case.
-
-The onap/resources/environment/onap-dev.yaml (see the excerpt below) enables
-for fine grained control on what components are included as part of this
-deployment. By changing this `so` line to `enabled: false` the `so` component
-will not be deployed.  If this change is part of an upgrade the existing `so`
-component will be shut down. Other `so` parameters and even `so` child values
-can be modified, for example the `so`'s `liveness` probe could be disabled
-(which is not recommended as this change would disable auto-healing of `so`).
-
-.. code-block:: yaml
-
-  #################################################################
-  # Global configuration overrides.
-  #
-  # These overrides will affect all helm charts (ie. applications)
-  # that are listed below and are 'enabled'.
-  #################################################################
-  global:
-  <...>
-
-  #################################################################
-  # Enable/disable and configure helm charts (ie. applications)
-  # to customize the ONAP deployment.
-  #################################################################
-  aaf:
-    enabled: false
-  <...>
-  so: # Service Orchestrator
-    enabled: true
-
-    replicaCount: 1
-
-    liveness:
-      # necessary to disable liveness probe when setting breakpoints
-      # in debugger so K8s doesn't restart unresponsive container
-      enabled: true
-
-  <...>
-
-Accessing the ONAP Portal using OOM and a Kubernetes Cluster
-------------------------------------------------------------
-
-The ONAP deployment created by OOM operates in a private IP network that isn't
-publicly accessible (i.e. OpenStack VMs with private internal network) which
-blocks access to the ONAP Portal. To enable direct access to this Portal from a
-user's own environment (a laptop etc.) the portal application's port 8989 is
-exposed through a `Kubernetes LoadBalancer`_ object.
-
-Typically, to be able to access the Kubernetes nodes publicly a public address
-is assigned. In OpenStack this is a floating IP address.
-
-When the `portal-app` chart is deployed a Kubernetes service is created that
-instantiates a load balancer.  The LB chooses the private interface of one of
-the nodes as in the example below (10.0.0.4 is private to the K8s cluster only).
-Then to be able to access the portal on port 8989 from outside the K8s &
-OpenStack environment, the user needs to assign/get the floating IP address that
-corresponds to the private IP as follows::
-
-  > kubectl -n onap get services|grep "portal-app"
-  portal-app  LoadBalancer   10.43.142.201   10.0.0.4   8989:30215/TCP,8006:30213/TCP,8010:30214/TCP   1d   app=portal-app,release=dev
-
-
-In this example, use the 10.0.0.4 private address as a key find the
-corresponding public address which in this example is 10.12.6.155. If you're
-using OpenStack you'll do the lookup with the horizon GUI or the OpenStack CLI
-for your tenant (openstack server list).  That IP is then used in your
-`/etc/hosts` to map the fixed DNS aliases required by the ONAP Portal as shown
-below::
-
-  10.12.6.155 portal.api.simpledemo.onap.org
-  10.12.6.155 vid.api.simpledemo.onap.org
-  10.12.6.155 sdc.api.fe.simpledemo.onap.org
-  10.12.6.155 sdc.workflow.plugin.simpledemo.onap.org
-  10.12.6.155 sdc.dcae.plugin.simpledemo.onap.org
-  10.12.6.155 portal-sdk.simpledemo.onap.org
-  10.12.6.155 policy.api.simpledemo.onap.org
-  10.12.6.155 aai.api.sparky.simpledemo.onap.org
-  10.12.6.155 cli.api.simpledemo.onap.org
-  10.12.6.155 msb.api.discovery.simpledemo.onap.org
-  10.12.6.155 msb.api.simpledemo.onap.org
-  10.12.6.155 clamp.api.simpledemo.onap.org
-  10.12.6.155 so.api.simpledemo.onap.org
-  10.12.6.155 sdc.workflow.plugin.simpledemo.onap.org
-
-Ensure you've disabled any proxy settings the browser you are using to access
-the portal and then simply access now the new ssl-encrypted URL:
-``https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm``
-
-.. note::
-  Using the HTTPS based Portal URL the Browser needs to be configured to accept
-  unsecure credentials.
-  Additionally when opening an Application inside the Portal, the Browser
-  might block the content, which requires to disable the blocking and reloading
-  of the page
-
-.. note::
-  Besides the ONAP Portal the Components can deliver additional user interfaces,
-  please check the Component specific documentation.
-
-.. note::
-
-   | Alternatives Considered:
-
-   -  Kubernetes port forwarding was considered but discarded as it would require
-      the end user to run a script that opens up port forwarding tunnels to each of
-      the pods that provides a portal application widget.
-
-   -  Reverting to a VNC server similar to what was deployed in the Amsterdam
-      release was also considered but there were many issues with resolution, lack
-      of volume mount, /etc/hosts dynamic update, file upload that were a tall order
-      to solve in time for the Beijing release.
-
-   Observations:
-
-   -  If you are not using floating IPs in your Kubernetes deployment and directly attaching
-      a public IP address (i.e. by using your public provider network) to your K8S Node
-      VMs' network interface, then the output of 'kubectl -n onap get services | grep "portal-app"'
-      will show your public IP instead of the private network's IP. Therefore,
-      you can grab this public IP directly (as compared to trying to find the floating
-      IP first) and map this IP in /etc/hosts.
-
-.. figure:: oomLogoV2-Monitor.png
-   :align: right
-
-Monitor
-=======
-
-All highly available systems include at least one facility to monitor the
-health of components within the system.  Such health monitors are often used as
-inputs to distributed coordination systems (such as etcd, Zookeeper, or Consul)
-and monitoring systems (such as Nagios or Zabbix). OOM provides two mechanisms
-to monitor the real-time health of an ONAP deployment:
-
-- a Consul GUI for a human operator or downstream monitoring systems and
-  Kubernetes liveness probes that enable automatic healing of failed
-  containers, and
-- a set of liveness probes which feed into the Kubernetes manager which
-  are described in the Heal section.
-
-Within ONAP, Consul is the monitoring system of choice and deployed by OOM in
-two parts:
-
-- a three-way, centralized Consul server cluster is deployed as a highly
-  available monitor of all of the ONAP components, and
-- a number of Consul agents.
-
-The Consul server provides a user interface that allows a user to graphically
-view the current health status of all of the ONAP components for which agents
-have been created - a sample from the ONAP Integration labs follows:
-
-.. figure:: consulHealth.png
-   :align: center
-
-To see the real-time health of a deployment go to: ``http://<kubernetes IP>:30270/ui/``
-where a GUI much like the following will be found:
-
-
-.. figure:: oomLogoV2-Heal.png
-   :align: right
-
-Heal
-====
-
-The ONAP deployment is defined by Helm charts as mentioned earlier.  These Helm
-charts are also used to implement automatic recoverability of ONAP components
-when individual components fail. Once ONAP is deployed, a "liveness" probe
-starts checking the health of the components after a specified startup time.
-
-Should a liveness probe indicate a failed container it will be terminated and a
-replacement will be started in its place - containers are ephemeral. Should the
-deployment specification indicate that there are one or more dependencies to
-this container or component (for example a dependency on a database) the
-dependency will be satisfied before the replacement container/component is
-started. This mechanism ensures that, after a failure, all of the ONAP
-components restart successfully.
-
-To test healing, the following command can be used to delete a pod::
-
-  > kubectl delete pod [pod name] -n [pod namespace]
-
-One could then use the following command to monitor the pods and observe the
-pod being terminated and the service being automatically healed with the
-creation of a replacement pod::
-
-  > kubectl get pods --all-namespaces -o=wide
-
-.. figure:: oomLogoV2-Scale.png
-   :align: right
-
-Scale
-=====
-
-Many of the ONAP components are horizontally scalable which allows them to
-adapt to expected offered load.  During the Beijing release scaling is static,
-that is during deployment or upgrade a cluster size is defined and this cluster
-will be maintained even in the presence of faults. The parameter that controls
-the cluster size of a given component is found in the values.yaml file for that
-component.  Here is an excerpt that shows this parameter:
-
-.. code-block:: yaml
-
-  # default number of instances
-  replicaCount: 1
-
-In order to change the size of a cluster, an operator could use a helm upgrade
-(described in detail in the next section) as follows::
-
-  > helm upgrade --set replicaCount=3 onap/so/mariadb
-
-The ONAP components use Kubernetes provided facilities to build clustered,
-highly available systems including: Services_ with load-balancers, ReplicaSet_,
-and StatefulSet_.  Some of the open-source projects used by the ONAP components
-directly support clustered configurations, for example ODL and MariaDB Galera.
-
-The Kubernetes Services_ abstraction to provide a consistent access point for
-each of the ONAP components, independent of the pod or container architecture
-of that component.  For example, SDN-C uses OpenDaylight clustering with a
-default cluster size of three but uses a Kubernetes service to and change the
-number of pods in this abstract this cluster from the other ONAP components
-such that the cluster could change size and this change is isolated from the
-other ONAP components by the load-balancer implemented in the ODL service
-abstraction.
-
-A ReplicaSet_ is a construct that is used to describe the desired state of the
-cluster.  For example 'replicas: 3' indicates to Kubernetes that a cluster of 3
-instances is the desired state.  Should one of the members of the cluster fail,
-a new member will be automatically started to replace it.
-
-Some of the ONAP components many need a more deterministic deployment; for
-example to enable intra-cluster communication. For these applications the
-component can be deployed as a Kubernetes StatefulSet_ which will maintain a
-persistent identifier for the pods and thus a stable network id for the pods.
-For example: the pod names might be web-0, web-1, web-{N-1} for N 'web' pods
-with corresponding DNS entries such that intra service communication is simple
-even if the pods are physically distributed across multiple nodes. An example
-of how these capabilities can be used is described in the Running Consul on
-Kubernetes tutorial.
-
-.. figure:: oomLogoV2-Upgrade.png
-   :align: right
-
-Upgrade
-=======
-
-Helm has built-in capabilities to enable the upgrade of pods without causing a
-loss of the service being provided by that pod or pods (if configured as a
-cluster).  As described in the OOM Developer's Guide, ONAP components provide
-an abstracted 'service' end point with the pods or containers providing this
-service hidden from other ONAP components by a load balancer. This capability
-is used during upgrades to allow a pod with a new image to be added to the
-service before removing the pod with the old image. This 'make before break'
-capability ensures minimal downtime.
-
-Prior to doing an upgrade, determine of the status of the deployed charts::
-
-  > helm list
-  NAME REVISION UPDATED                  STATUS    CHART     NAMESPACE
-  so   1        Mon Feb 5 10:05:22 2018  DEPLOYED  so-2.0.1  default
-
-When upgrading a cluster a parameter controls the minimum size of the cluster
-during the upgrade while another parameter controls the maximum number of nodes
-in the cluster.  For example, SNDC configured as a 3-way ODL cluster might
-require that during the upgrade no fewer than 2 pods are available at all times
-to provide service while no more than 5 pods are ever deployed across the two
-versions at any one time to avoid depleting the cluster of resources. In this
-scenario, the SDNC cluster would start with 3 old pods then Kubernetes may add
-a new pod (3 old, 1 new), delete one old (2 old, 1 new), add two new pods (2
-old, 3 new) and finally delete the 2 old pods (3 new).  During this sequence
-the constraints of the minimum of two pods and maximum of five would be
-maintained while providing service the whole time.
-
-Initiation of an upgrade is triggered by changes in the Helm charts.  For
-example, if the image specified for one of the pods in the SDNC deployment
-specification were to change (i.e. point to a new Docker image in the nexus3
-repository - commonly through the change of a deployment variable), the
-sequence of events described in the previous paragraph would be initiated.
-
-For example, to upgrade a container by changing configuration, specifically an
-environment value::
-
-  > helm deploy onap onap/so --version 2.0.1 --set enableDebug=true
-
-Issuing this command will result in the appropriate container being stopped by
-Kubernetes and replaced with a new container with the new environment value.
-
-To upgrade a component to a new version with a new configuration file enter::
-
-  > helm deploy onap onap/so --version 2.0.2 -f environments/demo.yaml
-
-To fetch release history enter::
-
-  > helm history so
-  REVISION UPDATED                  STATUS     CHART     DESCRIPTION
-  1        Mon Feb 5 10:05:22 2018  SUPERSEDED so-2.0.1  Install complete
-  2        Mon Feb 5 10:10:55 2018  DEPLOYED   so-2.0.2  Upgrade complete
-
-Unfortunately, not all upgrades are successful.  In recognition of this the
-lineup of pods within an ONAP deployment is tagged such that an administrator
-may force the ONAP deployment back to the previously tagged configuration or to
-a specific configuration, say to jump back two steps if an incompatibility
-between two ONAP components is discovered after the two individual upgrades
-succeeded.
-
-This rollback functionality gives the administrator confidence that in the
-unfortunate circumstance of a failed upgrade the system can be rapidly brought
-back to a known good state.  This process of rolling upgrades while under
-service is illustrated in this short YouTube video showing a Zero Downtime
-Upgrade of a web application while under a 10 million transaction per second
-load.
-
-For example, to roll-back back to previous system revision enter::
-
-  > helm rollback so 1
-
-  > helm history so
-  REVISION UPDATED                  STATUS     CHART     DESCRIPTION
-  1        Mon Feb 5 10:05:22 2018  SUPERSEDED so-2.0.1  Install complete
-  2        Mon Feb 5 10:10:55 2018  SUPERSEDED so-2.0.2  Upgrade complete
-  3        Mon Feb 5 10:14:32 2018  DEPLOYED   so-2.0.1  Rollback to 1
-
-.. note::
-
-  The description field can be overridden to document actions taken or include
-  tracking numbers.
-
-Many of the ONAP components contain their own databases which are used to
-record configuration or state information.  The schemas of these databases may
-change from version to version in such a way that data stored within the
-database needs to be migrated between versions. If such a migration script is
-available it can be invoked during the upgrade (or rollback) by Container
-Lifecycle Hooks. Two such hooks are available, PostStart and PreStop, which
-containers can access by registering a handler against one or both. Note that
-it is the responsibility of the ONAP component owners to implement the hook
-handlers - which could be a shell script or a call to a specific container HTTP
-endpoint - following the guidelines listed on the Kubernetes site. Lifecycle
-hooks are not restricted to database migration or even upgrades but can be used
-anywhere specific operations need to be taken during lifecycle operations.
-
-OOM uses Helm K8S package manager to deploy ONAP components. Each component is
-arranged in a packaging format called a chart - a collection of files that
-describe a set of k8s resources. Helm allows for rolling upgrades of the ONAP
-component deployed. To upgrade a component Helm release you will need an
-updated Helm chart. The chart might have modified, deleted or added values,
-deployment yamls, and more.  To get the release name use::
-
-  > helm ls
-
-To easily upgrade the release use::
-
-  > helm upgrade [RELEASE] [CHART]
-
-To roll back to a previous release version use::
-
-  > helm rollback [flags] [RELEASE] [REVISION]
-
-For example, to upgrade the onap-so helm release to the latest SO container
-release v1.1.2:
-
-- Edit so values.yaml which is part of the chart
-- Change "so: nexus3.onap.org:10001/openecomp/so:v1.1.1" to
-  "so: nexus3.onap.org:10001/openecomp/so:v1.1.2"
-- From the chart location run::
-
-  > helm upgrade onap-so
-
-The previous so pod will be terminated and a new so pod with an updated so
-container will be created.
-
-.. figure:: oomLogoV2-Delete.png
-   :align: right
-
-Delete
-======
-
-Existing deployments can be partially or fully removed once they are no longer
-needed.  To minimize errors it is recommended that before deleting components
-from a running deployment the operator perform a 'dry-run' to display exactly
-what will happen with a given command prior to actually deleting anything.  For
-example::
-
-  > helm undeploy onap --dry-run
-
-will display the outcome of deleting the 'onap' release from the
-deployment.
-To completely delete a release and remove it from the internal store enter::
-
-  > helm undeploy onap
-
-One can also remove individual components from a deployment by changing the
-ONAP configuration values.  For example, to remove `so` from a running
-deployment enter::
-
-  > helm undeploy onap-so
-
-will remove `so` as the configuration indicates it's no longer part of the
-deployment. This might be useful if a one wanted to replace just `so` by
-installing a custom version.
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 16bc15d..d8e529a 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -49,8 +49,8 @@
 New features
 ------------
 
-* Kubernetes support for version up to 1.19
-* Helm (experimental) support for version up to 3.3
+* Kubernetes support for version up to 1.20
+* Helm support for version up to 3.5
 * Limits are set for most of the components
 
 **Bug fixes**
diff --git a/kubernetes/a1policymanagement/Chart.yaml b/kubernetes/a1policymanagement/Chart.yaml
index 6ec0159..919cca8 100644
--- a/kubernetes/a1policymanagement/Chart.yaml
+++ b/kubernetes/a1policymanagement/Chart.yaml
@@ -18,4 +18,4 @@
 appVersion: "1.0.0"
 description: A Helm chart for A1 Policy Management Service
 name: a1policymanagement
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/a1policymanagement/requirements.yaml b/kubernetes/a1policymanagement/requirements.yaml
index 1872e91..ba5f5d5 100644
--- a/kubernetes/a1policymanagement/requirements.yaml
+++ b/kubernetes/a1policymanagement/requirements.yaml
@@ -16,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml
index e957774..25d921e 100644
--- a/kubernetes/aaf/Chart.yaml
+++ b/kubernetes/aaf/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Application Authorization Framework
 name: aaf
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aaf/components/aaf-cass/Chart.yaml b/kubernetes/aaf/components/aaf-cass/Chart.yaml
index 62e0b54..a3be84f 100644
--- a/kubernetes/aaf/components/aaf-cass/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cass/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF cassandra
 name: aaf-cass
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aaf/components/aaf-cass/requirements.yaml b/kubernetes/aaf/components/aaf-cass/requirements.yaml
index f1f5e64..e89dc58 100644
--- a/kubernetes/aaf/components/aaf-cass/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-cass/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-cm/Chart.yaml b/kubernetes/aaf/components/aaf-cm/Chart.yaml
index e674fac..f5fd4ea 100644
--- a/kubernetes/aaf/components/aaf-cm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cm/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAF Certificate Manager
 name: aaf-cm
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aaf/components/aaf-cm/requirements.yaml b/kubernetes/aaf/components/aaf-cm/requirements.yaml
index 33a192b..5715c23 100644
--- a/kubernetes/aaf/components/aaf-cm/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-cm/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~7.x-0
+    version: ~8.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 df15819..fc1f072 100644
--- a/kubernetes/aaf/components/aaf-fs/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-fs/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF File Server
 name: aaf-fs
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/aaf/components/aaf-fs/requirements.yaml b/kubernetes/aaf/components/aaf-fs/requirements.yaml
index 33a192b..5715c23 100644
--- a/kubernetes/aaf/components/aaf-fs/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-fs/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~7.x-0
+    version: ~8.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 2eb6c7e..cea5634 100644
--- a/kubernetes/aaf/components/aaf-gui/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-gui/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF GUI
 name: aaf-gui
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/aaf/components/aaf-gui/requirements.yaml b/kubernetes/aaf/components/aaf-gui/requirements.yaml
index a0ab294..4e6c3e6 100644
--- a/kubernetes/aaf/components/aaf-gui/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-gui/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~7.x-0
+    version: ~8.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 0b11b2f..66bf3c0 100644
--- a/kubernetes/aaf/components/aaf-hello/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-hello/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF Hello
 name: aaf-hello
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/aaf/components/aaf-hello/requirements.yaml b/kubernetes/aaf/components/aaf-hello/requirements.yaml
index a0ab294..4e6c3e6 100644
--- a/kubernetes/aaf/components/aaf-hello/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-hello/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~7.x-0
+    version: ~8.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 ab8443c..ef8928c 100644
--- a/kubernetes/aaf/components/aaf-locate/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-locate/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF Locate
 name: aaf-locate
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/aaf/components/aaf-locate/requirements.yaml b/kubernetes/aaf/components/aaf-locate/requirements.yaml
index a0ab294..4e6c3e6 100644
--- a/kubernetes/aaf/components/aaf-locate/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-locate/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~7.x-0
+    version: ~8.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 ac76618..4b93d5f 100644
--- a/kubernetes/aaf/components/aaf-oauth/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF OAuth
 name: aaf-oauth
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/aaf/components/aaf-oauth/requirements.yaml b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
index a0ab294..4e6c3e6 100644
--- a/kubernetes/aaf/components/aaf-oauth/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~7.x-0
+    version: ~8.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 9bf1a88..a533f56 100644
--- a/kubernetes/aaf/components/aaf-service/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-service/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF Service
 name: aaf-service
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aaf/components/aaf-service/requirements.yaml b/kubernetes/aaf/components/aaf-service/requirements.yaml
index a0ab294..4e6c3e6 100644
--- a/kubernetes/aaf/components/aaf-service/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-service/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: aaf-templates
-    version: ~7.x-0
+    version: ~8.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 0d8cef7..df5240f 100644
--- a/kubernetes/aaf/components/aaf-sms/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Secret Management Service
 name: aaf-sms
-version: 7.0.0
+version: 8.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 f06d82d..5eef273 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
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Secret Management Service Quorum Client
 name: aaf-sms-quorumclient
-version: 7.0.0
+version: 8.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 f1f5e64..e89dc58 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
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 19ece7b..77e6d12 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
@@ -16,4 +16,4 @@
 description: Chart to launch Vault as SMS backend
 name: aaf-sms-vault
 appVersion: 0.9.5
-version: 7.0.0
+version: 8.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 f1f5e64..e89dc58 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
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/requirements.yaml b/kubernetes/aaf/components/aaf-sms/requirements.yaml
index 11a7c3a..1876fda 100644
--- a/kubernetes/aaf/components/aaf-sms/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sms/requirements.yaml
@@ -14,17 +14,17 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: aaf-sms-quorumclient
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-sms-quorumclient'
   - name: aaf-sms-vault
-    version: ~7.x-0
+    version: ~8.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 c359799..157262b 100644
--- a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Hardware Security Components
 name: aaf-sshsm
-version: 7.0.0
+version: 8.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 d3b04fb..63217a2 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
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Trusted Platform Module Resource Manager
 name: aaf-sshsm-abrmd
-version: 7.0.0
+version: 8.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 4144bfa..594b12d 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
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 1e881b5..311130e 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
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Trusted Platform Module Distribution Center
 name: aaf-sshsm-distcenter
-version: 7.0.0
+version: 8.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 4144bfa..594b12d 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
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 ca82abb..a50d95f 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
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Trusted Platform Module Test CA Service
 name: aaf-sshsm-testca
-version: 7.0.0
+version: 8.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 4144bfa..594b12d 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
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
index 831e0af..134666d 100644
--- a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
@@ -14,20 +14,20 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: aaf-sshsm-abrmd
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-sshsm-abrmd'
     condition: aaf-sshsm-abrmd.enabled
   - name: aaf-sshsm-distcenter
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-sshsm-distcenter'
     condition: aaf-sshsm-distcenter.enabled
   - name: aaf-sshsm-testca
-    version: ~7.x-0
+    version: ~8.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 04e41e9..f87e6b8 100644
--- a/kubernetes/aaf/components/aaf-templates/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-templates/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Application Authorization Framework Templates
 name: aaf-templates
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aaf/components/aaf-templates/requirements.yaml b/kubernetes/aaf/components/aaf-templates/requirements.yaml
index d2e48a6..cead078 100644
--- a/kubernetes/aaf/components/aaf-templates/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-templates/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/requirements.yaml b/kubernetes/aaf/requirements.yaml
index 7b63a6d..5e1f33f 100644
--- a/kubernetes/aaf/requirements.yaml
+++ b/kubernetes/aaf/requirements.yaml
@@ -17,32 +17,32 @@
 
 dependencies:
   - name: aaf-cass
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-cass'
   - name: aaf-cm
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-cm'
   - name: aaf-fs
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-fs'
   - name: aaf-gui
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-gui'
   - name: aaf-hello
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-hello'
   - name: aaf-locate
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-locate'
   - name: aaf-oauth
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-oauth'
   - name: aaf-service
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-service'
   - name: aaf-sms
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-sms'
   - name: aaf-sshsm
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aaf-sshsm'
diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index 41e4039..5d59ef5 100644
--- a/kubernetes/aai/Chart.yaml
+++ b/kubernetes/aai/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Active and Available Inventory
 name: aai
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aai/components/aai-babel/Chart.yaml b/kubernetes/aai/components/aai-babel/Chart.yaml
index 1fcad30..8f6c923 100644
--- a/kubernetes/aai/components/aai-babel/Chart.yaml
+++ b/kubernetes/aai/components/aai-babel/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Babel microservice
 name: aai-babel
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aai/components/aai-babel/requirements.yaml b/kubernetes/aai/components/aai-babel/requirements.yaml
index 3dfdc90..67d45f0 100644
--- a/kubernetes/aai/components/aai-babel/requirements.yaml
+++ b/kubernetes/aai/components/aai-babel/requirements.yaml
@@ -15,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/aai/components/aai-graphadmin/Chart.yaml b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
index 2388e62..911e989 100644
--- a/kubernetes/aai/components/aai-graphadmin/Chart.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
@@ -20,4 +20,4 @@
 apiVersion: v1
 description: ONAP AAI GraphAdmin
 name: aai-graphadmin
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aai/components/aai-graphadmin/requirements.yaml b/kubernetes/aai/components/aai-graphadmin/requirements.yaml
index 42641a2..cf22720 100644
--- a/kubernetes/aai/components/aai-graphadmin/requirements.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/requirements.yaml
@@ -16,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/aai/components/aai-modelloader/Chart.yaml b/kubernetes/aai/components/aai-modelloader/Chart.yaml
index 98c842d..74b2912 100644
--- a/kubernetes/aai/components/aai-modelloader/Chart.yaml
+++ b/kubernetes/aai/components/aai-modelloader/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAI modelloader
 name: aai-modelloader
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aai/components/aai-modelloader/requirements.yaml b/kubernetes/aai/components/aai-modelloader/requirements.yaml
index 42641a2..cf22720 100644
--- a/kubernetes/aai/components/aai-modelloader/requirements.yaml
+++ b/kubernetes/aai/components/aai-modelloader/requirements.yaml
@@ -16,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/aai/components/aai-resources/Chart.yaml b/kubernetes/aai/components/aai-resources/Chart.yaml
index 7ee15fb..62e8c81 100644
--- a/kubernetes/aai/components/aai-resources/Chart.yaml
+++ b/kubernetes/aai/components/aai-resources/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAI resources
 name: aai-resources
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aai/components/aai-resources/requirements.yaml b/kubernetes/aai/components/aai-resources/requirements.yaml
index 498f1b8..f9ba1c1 100644
--- a/kubernetes/aai/components/aai-resources/requirements.yaml
+++ b/kubernetes/aai/components/aai-resources/requirements.yaml
@@ -16,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.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 8894701..c27ac5e 100644
--- a/kubernetes/aai/components/aai-schema-service/Chart.yaml
+++ b/kubernetes/aai/components/aai-schema-service/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAI Schema Service
 name: aai-schema-service
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aai/components/aai-schema-service/requirements.yaml b/kubernetes/aai/components/aai-schema-service/requirements.yaml
index 42641a2..cf22720 100644
--- a/kubernetes/aai/components/aai-schema-service/requirements.yaml
+++ b/kubernetes/aai/components/aai-schema-service/requirements.yaml
@@ -16,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.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 a817934..a9ba0b2 100644
--- a/kubernetes/aai/components/aai-sparky-be/Chart.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAI sparky-be
 name: aai-sparky-be
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aai/components/aai-sparky-be/requirements.yaml b/kubernetes/aai/components/aai-sparky-be/requirements.yaml
index 42641a2..cf22720 100644
--- a/kubernetes/aai/components/aai-sparky-be/requirements.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/requirements.yaml
@@ -16,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/aai/components/aai-traversal/Chart.yaml b/kubernetes/aai/components/aai-traversal/Chart.yaml
index 80ff28e..c21bf1b 100644
--- a/kubernetes/aai/components/aai-traversal/Chart.yaml
+++ b/kubernetes/aai/components/aai-traversal/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAI traversal
 name: aai-traversal
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/aai/components/aai-traversal/requirements.yaml b/kubernetes/aai/components/aai-traversal/requirements.yaml
index 498f1b8..f9ba1c1 100644
--- a/kubernetes/aai/components/aai-traversal/requirements.yaml
+++ b/kubernetes/aai/components/aai-traversal/requirements.yaml
@@ -16,14 +16,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/aai/requirements.yaml b/kubernetes/aai/requirements.yaml
index 42b0f00..8b37ef7 100644
--- a/kubernetes/aai/requirements.yaml
+++ b/kubernetes/aai/requirements.yaml
@@ -16,49 +16,49 @@
 ---
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: aai-babel
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aai-babel'
     condition: aai-babel.enabled
   - name: aai-graphadmin
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aai-graphadmin'
     condition: aai-graphadmin.enabled
   - name: aai-modelloader
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aai-modelloader'
     condition: aai-modelloader.enabled
   - name: aai-resources
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aai-resources'
     condition: aai-resources.enabled
   - name: aai-schema-service
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aai-schema-service'
     condition: aai-schema-service.enabled
   - name: aai-sparky-be
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aai-sparky-be'
     condition: aai-sparky-be.enabled
   - name: aai-traversal
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/aai-traversal'
     condition: aai-traversal.enabled
diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml
index e864c97..468f564 100644
--- a/kubernetes/appc/Chart.yaml
+++ b/kubernetes/appc/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Application Controller
 name: appc
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/appc/components/appc-ansible-server/Chart.yaml b/kubernetes/appc/components/appc-ansible-server/Chart.yaml
index 5f09ca8..95615ce 100644
--- a/kubernetes/appc/components/appc-ansible-server/Chart.yaml
+++ b/kubernetes/appc/components/appc-ansible-server/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP APPC Ansible Server
 name: appc-ansible-server
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/appc/components/appc-ansible-server/requirements.yaml b/kubernetes/appc/components/appc-ansible-server/requirements.yaml
index af6016b..5b6288a 100644
--- a/kubernetes/appc/components/appc-ansible-server/requirements.yaml
+++ b/kubernetes/appc/components/appc-ansible-server/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/appc/components/appc-cdt/Chart.yaml b/kubernetes/appc/components/appc-cdt/Chart.yaml
index 51668a9..7f29f2a 100644
--- a/kubernetes/appc/components/appc-cdt/Chart.yaml
+++ b/kubernetes/appc/components/appc-cdt/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP APPC Self Service Controller Design Tool
 name: appc-cdt
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/appc/components/appc-cdt/requirements.yaml b/kubernetes/appc/components/appc-cdt/requirements.yaml
index 8fda7eb..7ce274a 100644
--- a/kubernetes/appc/components/appc-cdt/requirements.yaml
+++ b/kubernetes/appc/components/appc-cdt/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/appc/requirements.yaml b/kubernetes/appc/requirements.yaml
index adb6a93..b4960c2 100644
--- a/kubernetes/appc/requirements.yaml
+++ b/kubernetes/appc/requirements.yaml
@@ -14,22 +14,22 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: dgbuilder
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: appc-ansible-server
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/appc-ansible-server'
     condition: appc-ansible-server.enabled
   - name: appc-cdt
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/appc-cdt'
-    condition: appc-cdt.enabled
\ No newline at end of file
+    condition: appc-cdt.enabled
diff --git a/kubernetes/cds/Chart.yaml b/kubernetes/cds/Chart.yaml
index ab34de4..09955ed 100644
--- a/kubernetes/cds/Chart.yaml
+++ b/kubernetes/cds/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Controller Design Studio (CDS)
 name: cds
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
index 1c5f0e0..0026707 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP CDS Blueprints Processor
 name: cds-blueprints-processor
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
index 84c8e72..d0ff623 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.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 f0d5058..a2659f4 100755
--- a/kubernetes/cds/components/cds-command-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-command-executor/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP CDS Command Executor
 name: cds-command-executor
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/cds/components/cds-command-executor/requirements.yaml b/kubernetes/cds/components/cds-command-executor/requirements.yaml
index ff51b44..bd647a6 100755
--- a/kubernetes/cds/components/cds-command-executor/requirements.yaml
+++ b/kubernetes/cds/components/cds-command-executor/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.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 d7e319a..e4d1453 100755
--- a/kubernetes/cds/components/cds-py-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-py-executor/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP CDS Py Executor
 name: cds-py-executor
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/cds/components/cds-py-executor/requirements.yaml b/kubernetes/cds/components/cds-py-executor/requirements.yaml
index 1542f20..626de2f 100755
--- a/kubernetes/cds/components/cds-py-executor/requirements.yaml
+++ b/kubernetes/cds/components/cds-py-executor/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.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 c2fa653..9f524b2 100755
--- a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP CDS SDC listener microservice
 name: cds-sdc-listener
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
index ff51b44..bd647a6 100755
--- a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/cds/components/cds-ui/Chart.yaml b/kubernetes/cds/components/cds-ui/Chart.yaml
index ae14cb9..1fb0dd5 100644
--- a/kubernetes/cds/components/cds-ui/Chart.yaml
+++ b/kubernetes/cds/components/cds-ui/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP CDS UI
 name: cds-ui
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/cds/components/cds-ui/requirements.yaml b/kubernetes/cds/components/cds-ui/requirements.yaml
index 2f608f1..a4e5fe5 100644
--- a/kubernetes/cds/components/cds-ui/requirements.yaml
+++ b/kubernetes/cds/components/cds-ui/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml
index 429b109..58ae5a0 100644
--- a/kubernetes/cds/requirements.yaml
+++ b/kubernetes/cds/requirements.yaml
@@ -15,28 +15,28 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: cds-blueprints-processor
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/cds-blueprints-processor'
     condition: cds-blueprints-processor.enabled
   - name: cds-command-executor
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/cds-command-executor'
     condition: cds-command-executor.enabled
   - name: cds-py-executor
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/cds-py-executor'
     condition: cds-py-executor.enabled
   - name: cds-sdc-listener
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/cds-sdc-listener'
     condition: cds-sdc-listener.enabled
   - name: cds-ui
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/cds-ui'
     condition: cds-ui.enabled
diff --git a/kubernetes/cli/Chart.yaml b/kubernetes/cli/Chart.yaml
index 8fa1d3c..469cb6d 100644
--- a/kubernetes/cli/Chart.yaml
+++ b/kubernetes/cli/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Command Line Interface
 name: cli
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/cli/requirements.yaml b/kubernetes/cli/requirements.yaml
index 2050d85..e2ce84d 100644
--- a/kubernetes/cli/requirements.yaml
+++ b/kubernetes/cli/requirements.yaml
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml
index 704ea21..573e7d9 100644
--- a/kubernetes/common/cassandra/Chart.yaml
+++ b/kubernetes/common/cassandra/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP cassandra
 name: cassandra
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/cassandra/requirements.yaml b/kubernetes/common/cassandra/requirements.yaml
index cd708fc..501cc89 100644
--- a/kubernetes/common/cassandra/requirements.yaml
+++ b/kubernetes/common/cassandra/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/cert-wrapper/Chart.yaml b/kubernetes/common/cert-wrapper/Chart.yaml
index 5ef91a0..ef18eaa 100644
--- a/kubernetes/common/cert-wrapper/Chart.yaml
+++ b/kubernetes/common/cert-wrapper/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Wrapper chart to allow truststore to be shared among cert-initializer instances
 name: cert-wrapper
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/cert-wrapper/requirements.yaml b/kubernetes/common/cert-wrapper/requirements.yaml
index 34ac310..744d81f 100644
--- a/kubernetes/common/cert-wrapper/requirements.yaml
+++ b/kubernetes/common/cert-wrapper/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../certInitializer'
diff --git a/kubernetes/common/certInitializer/Chart.yaml b/kubernetes/common/certInitializer/Chart.yaml
index e933a02..371023b 100644
--- a/kubernetes/common/certInitializer/Chart.yaml
+++ b/kubernetes/common/certInitializer/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Template used to obtain certificates in onap
 name: certInitializer
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/certInitializer/requirements.yaml b/kubernetes/common/certInitializer/requirements.yaml
index 3677d45..78775ae 100644
--- a/kubernetes/common/certInitializer/requirements.yaml
+++ b/kubernetes/common/certInitializer/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: readinessCheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../readinessCheck'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/certManagerCertificate/Chart.yaml b/kubernetes/common/certManagerCertificate/Chart.yaml
index 305d252..8c0113b 100644
--- a/kubernetes/common/certManagerCertificate/Chart.yaml
+++ b/kubernetes/common/certManagerCertificate/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 name: certManagerCertificate
 description: A Helm chart for Cert-Manager Certificate CRD template
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/certManagerCertificate/requirements.yaml b/kubernetes/common/certManagerCertificate/requirements.yaml
index 6bcaed0..210a02c 100644
--- a/kubernetes/common/certManagerCertificate/requirements.yaml
+++ b/kubernetes/common/certManagerCertificate/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
diff --git a/kubernetes/common/cmpv2Certificate/Chart.yaml b/kubernetes/common/cmpv2Certificate/Chart.yaml
index e50de72..6641ec6 100644
--- a/kubernetes/common/cmpv2Certificate/Chart.yaml
+++ b/kubernetes/common/cmpv2Certificate/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Template used to add cmpv2 certificates to components
 name: cmpv2Certificate
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/cmpv2Certificate/requirements.yaml b/kubernetes/common/cmpv2Certificate/requirements.yaml
index 367d879..87509d1 100644
--- a/kubernetes/common/cmpv2Certificate/requirements.yaml
+++ b/kubernetes/common/cmpv2Certificate/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/cmpv2Config/Chart.yaml b/kubernetes/common/cmpv2Config/Chart.yaml
index 3559955..bac8276 100644
--- a/kubernetes/common/cmpv2Config/Chart.yaml
+++ b/kubernetes/common/cmpv2Config/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Template used to store cmpv2 configuration in onap
 name: cmpv2Config
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/cmpv2Config/requirements.yaml b/kubernetes/common/cmpv2Config/requirements.yaml
index ac321e7..5a100d3 100644
--- a/kubernetes/common/cmpv2Config/requirements.yaml
+++ b/kubernetes/common/cmpv2Config/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index 567055b..f184cb9 100644
--- a/kubernetes/common/common/Chart.yaml
+++ b/kubernetes/common/common/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Common templates for inclusion in other charts
 name: common
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml
index 624f193..0f2b546 100644
--- a/kubernetes/common/dgbuilder/Chart.yaml
+++ b/kubernetes/common/dgbuilder/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: D.G. Builder application
 name: dgbuilder
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/common/dgbuilder/requirements.yaml b/kubernetes/common/dgbuilder/requirements.yaml
index 3a5558b..0157b70 100644
--- a/kubernetes/common/dgbuilder/requirements.yaml
+++ b/kubernetes/common/dgbuilder/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: 'file://../repositoryGenerator'
\ No newline at end of file
+    version: ~8.x-0
+    repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/Chart.yaml b/kubernetes/common/elasticsearch/Chart.yaml
index 0839d9f..494aaf0 100644
--- a/kubernetes/common/elasticsearch/Chart.yaml
+++ b/kubernetes/common/elasticsearch/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP elasticsearch
 name: elasticsearch
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/elasticsearch/components/curator/Chart.yaml b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
index 1b34db6..d113870 100644
--- a/kubernetes/common/elasticsearch/components/curator/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP elasticsearch curator
 name: curator
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/elasticsearch/components/curator/requirements.yaml b/kubernetes/common/elasticsearch/components/curator/requirements.yaml
index 43e8bbb..d7bac0b 100644
--- a/kubernetes/common/elasticsearch/components/curator/requirements.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/data/Chart.yaml b/kubernetes/common/elasticsearch/components/data/Chart.yaml
index 3ae79a5..65251f6 100644
--- a/kubernetes/common/elasticsearch/components/data/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/data/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP elasticsearch data
 name: data
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/elasticsearch/components/data/requirements.yaml b/kubernetes/common/elasticsearch/components/data/requirements.yaml
index 27cdebc..3a52cbe 100644
--- a/kubernetes/common/elasticsearch/components/data/requirements.yaml
+++ b/kubernetes/common/elasticsearch/components/data/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/master/Chart.yaml b/kubernetes/common/elasticsearch/components/master/Chart.yaml
index 6c26b61..f3fa699 100644
--- a/kubernetes/common/elasticsearch/components/master/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/master/Chart.yaml
@@ -17,4 +17,4 @@
 apiVersion: v1
 description: ONAP elasticsearch master
 name: master
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/elasticsearch/components/master/requirements.yaml b/kubernetes/common/elasticsearch/components/master/requirements.yaml
index 27cdebc..3a52cbe 100644
--- a/kubernetes/common/elasticsearch/components/master/requirements.yaml
+++ b/kubernetes/common/elasticsearch/components/master/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/requirements.yaml b/kubernetes/common/elasticsearch/requirements.yaml
index 15379e4..e252569 100644
--- a/kubernetes/common/elasticsearch/requirements.yaml
+++ b/kubernetes/common/elasticsearch/requirements.yaml
@@ -14,22 +14,22 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: master
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/master'
   - name: data
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/data'
     condition: elasticsearch.data.enabled,data.enabled
   - name: curator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/curator'
     condition: elasticsearch.curator.enabled,curator.enabled
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../certInitializer'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml
index dbd8203..72d7bdb 100644
--- a/kubernetes/common/etcd/Chart.yaml
+++ b/kubernetes/common/etcd/Chart.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 name: etcd
 home: https://github.com/coreos/etcd
-version: 7.0.0
+version: 8.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 bf85c74..da0ef74 100644
--- a/kubernetes/common/etcd/requirements.yaml
+++ b/kubernetes/common/etcd/requirements.yaml
@@ -14,8 +14,8 @@
 # limitations under the License
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/logConfiguration/Chart.yaml b/kubernetes/common/logConfiguration/Chart.yaml
index 0b8c4f7..1d1678e 100644
--- a/kubernetes/common/logConfiguration/Chart.yaml
+++ b/kubernetes/common/logConfiguration/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Template used to create same STDOUT log configuration
 name: logConfiguration
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/logConfiguration/requirements.yaml b/kubernetes/common/logConfiguration/requirements.yaml
index 51e8789..6bd7f98 100644
--- a/kubernetes/common/logConfiguration/requirements.yaml
+++ b/kubernetes/common/logConfiguration/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml
index 209c8c0..2905b31 100644
--- a/kubernetes/common/mariadb-galera/Chart.yaml
+++ b/kubernetes/common/mariadb-galera/Chart.yaml
@@ -16,11 +16,11 @@
 apiVersion: v1
 description: Chart for MariaDB Galera cluster
 name: mariadb-galera
-version: 7.0.0
+version: 8.0.0
 keywords:
   - mariadb
   - mysql
   - database
   - sql
   - galera
-  - cluster
\ No newline at end of file
+  - cluster
diff --git a/kubernetes/common/mariadb-galera/requirements.yaml b/kubernetes/common/mariadb-galera/requirements.yaml
index b378e57..cec7a1b 100644
--- a/kubernetes/common/mariadb-galera/requirements.yaml
+++ b/kubernetes/common/mariadb-galera/requirements.yaml
@@ -15,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: readinessCheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../readinessCheck'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
   - name: serviceAccount
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/mariadb-init/Chart.yaml b/kubernetes/common/mariadb-init/Chart.yaml
index 30cc3fc..2c679ff 100644
--- a/kubernetes/common/mariadb-init/Chart.yaml
+++ b/kubernetes/common/mariadb-init/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Chart for MariaDB Galera init job
 name: mariadb-init
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/mariadb-init/requirements.yaml b/kubernetes/common/mariadb-init/requirements.yaml
index 2397316..0a1d9f3 100644
--- a/kubernetes/common/mariadb-init/requirements.yaml
+++ b/kubernetes/common/mariadb-init/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: 'file://../repositoryGenerator'
\ No newline at end of file
+    version: ~8.x-0
+    repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/mongo/Chart.yaml b/kubernetes/common/mongo/Chart.yaml
index 864185d..ad35ea0 100644
--- a/kubernetes/common/mongo/Chart.yaml
+++ b/kubernetes/common/mongo/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: MongoDB Server
 name: mongo
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/mongo/requirements.yaml b/kubernetes/common/mongo/requirements.yaml
index 56a9be6..ba0feec 100644
--- a/kubernetes/common/mongo/requirements.yaml
+++ b/kubernetes/common/mongo/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/music/Chart.yaml b/kubernetes/common/music/Chart.yaml
index 9e3eb23..7ba72ef 100644
--- a/kubernetes/common/music/Chart.yaml
+++ b/kubernetes/common/music/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: MUSIC - Multi-site State Coordination Service
 name: music
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/music/components/music-cassandra/Chart.yaml b/kubernetes/common/music/components/music-cassandra/Chart.yaml
index ed2488c..2e4be22 100644
--- a/kubernetes/common/music/components/music-cassandra/Chart.yaml
+++ b/kubernetes/common/music/components/music-cassandra/Chart.yaml
@@ -15,5 +15,4 @@
 apiVersion: v1
 description: ONAP - Cassandra Database
 name: music-cassandra
-version: 7.0.0
-
+version: 8.0.0
diff --git a/kubernetes/common/music/components/music-cassandra/requirements.yaml b/kubernetes/common/music/components/music-cassandra/requirements.yaml
index 3d71e30..4e8a85a 100644
--- a/kubernetes/common/music/components/music-cassandra/requirements.yaml
+++ b/kubernetes/common/music/components/music-cassandra/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/music/requirements.yaml b/kubernetes/common/music/requirements.yaml
index 0a3c931..d16ce06 100644
--- a/kubernetes/common/music/requirements.yaml
+++ b/kubernetes/common/music/requirements.yaml
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: music-cassandra
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/music-cassandra'
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
   - name: certInitializer
-    version: ~7.x-0
-    repository: 'file://../certInitializer'
\ No newline at end of file
+    version: ~8.x-0
+    repository: 'file://../certInitializer'
diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml
index 4898658..173dd33 100644
--- a/kubernetes/common/network-name-gen/Chart.yaml
+++ b/kubernetes/common/network-name-gen/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Name Generation Micro Service
 name: network-name-gen
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml
index cfd308c..e543bc6 100644
--- a/kubernetes/common/network-name-gen/requirements.yaml
+++ b/kubernetes/common/network-name-gen/requirements.yaml
@@ -14,16 +14,16 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../mariadb-galera'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../mariadb-init'
     condition: not global.mariadbGalera.localCluster
diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml
index d629e04..26c55c7 100644
--- a/kubernetes/common/postgres/Chart.yaml
+++ b/kubernetes/common/postgres/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Postgres Server
 name: postgres
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/postgres/requirements.yaml b/kubernetes/common/postgres/requirements.yaml
index 2fdf57a..7d04073 100644
--- a/kubernetes/common/postgres/requirements.yaml
+++ b/kubernetes/common/postgres/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/postgres/templates/_deployment.tpl b/kubernetes/common/postgres/templates/_deployment.tpl
index 38a7ce1..7d04501 100644
--- a/kubernetes/common/postgres/templates/_deployment.tpl
+++ b/kubernetes/common/postgres/templates/_deployment.tpl
@@ -58,6 +58,8 @@
         env:
         - name: PG_PRIMARY_USER
           value: primaryuser
+        - name: MODE
+          value: postgres
         - name: PG_PRIMARY_PASSWORD_INPUT
           {{- include "common.secret.envFromSecretFast" (dict "global" $dot "uid" (include "common.postgres.secret.primaryPasswordUID" .) "key" "password") | indent 10 }}
         - name: PG_USER
@@ -117,6 +119,8 @@
           value: /tmp
         - name: PG_PRIMARY_USER
           value: primaryuser
+        - name: MODE
+          value: postgres
         - name: PG_MODE
           value: {{ $pgMode }}
         - name: PG_PRIMARY_HOST
diff --git a/kubernetes/common/readinessCheck/Chart.yaml b/kubernetes/common/readinessCheck/Chart.yaml
index 62f8e86..842dd7d 100644
--- a/kubernetes/common/readinessCheck/Chart.yaml
+++ b/kubernetes/common/readinessCheck/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Template used to wait for other deployment/sts/jobs in onap
 name: readinessCheck
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/readinessCheck/requirements.yaml b/kubernetes/common/readinessCheck/requirements.yaml
index 9ef1615..0a1d9f3 100644
--- a/kubernetes/common/readinessCheck/requirements.yaml
+++ b/kubernetes/common/readinessCheck/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/repository-wrapper/Chart.yaml b/kubernetes/common/repository-wrapper/Chart.yaml
index a65867b..6018f6a 100644
--- a/kubernetes/common/repository-wrapper/Chart.yaml
+++ b/kubernetes/common/repository-wrapper/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Wrapper chart to allow docker secret to be shared all instances
 name: repository-wrapper
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/repository-wrapper/requirements.yaml b/kubernetes/common/repository-wrapper/requirements.yaml
index 9ef1615..0a1d9f3 100644
--- a/kubernetes/common/repository-wrapper/requirements.yaml
+++ b/kubernetes/common/repository-wrapper/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/repositoryGenerator/Chart.yaml b/kubernetes/common/repositoryGenerator/Chart.yaml
index 3244b82..fc10b1b 100644
--- a/kubernetes/common/repositoryGenerator/Chart.yaml
+++ b/kubernetes/common/repositoryGenerator/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Template used to generate the right repository link
 name: repositoryGenerator
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/repositoryGenerator/values.yaml b/kubernetes/common/repositoryGenerator/values.yaml
index 5596756..386ba9b 100644
--- a/kubernetes/common/repositoryGenerator/values.yaml
+++ b/kubernetes/common/repositoryGenerator/values.yaml
@@ -32,7 +32,7 @@
   loggingImage: beats/filebeat:5.5.0
   mariadbImage: bitnami/mariadb:10.5.8
   nginxImage: bitnami/nginx:1.18-debian-10
-  postgresImage: crunchydata/crunchy-postgres:centos7-10.11-4.2.1
+  postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
   readinessImage: onap/oom/readiness:3.0.1
 
   # Default credentials
diff --git a/kubernetes/common/serviceAccount/Chart.yaml b/kubernetes/common/serviceAccount/Chart.yaml
index bbabba2..034e5ee 100644
--- a/kubernetes/common/serviceAccount/Chart.yaml
+++ b/kubernetes/common/serviceAccount/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Template used to create the right Service Accounts / Role / RoleBinding
 name: serviceAccount
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/common/serviceAccount/requirements.yaml b/kubernetes/common/serviceAccount/requirements.yaml
index 51e8789..6bd7f98 100644
--- a/kubernetes/common/serviceAccount/requirements.yaml
+++ b/kubernetes/common/serviceAccount/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../common'
diff --git a/kubernetes/consul/Chart.yaml b/kubernetes/consul/Chart.yaml
index 88acea9..970ab43 100644
--- a/kubernetes/consul/Chart.yaml
+++ b/kubernetes/consul/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Consul Agent
 name: consul
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/consul/components/consul-server/Chart.yaml b/kubernetes/consul/components/consul-server/Chart.yaml
index 8a94ed5..fe5546c 100644
--- a/kubernetes/consul/components/consul-server/Chart.yaml
+++ b/kubernetes/consul/components/consul-server/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Consul Server
 name: consul-server
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/consul/components/consul-server/requirements.yaml b/kubernetes/consul/components/consul-server/requirements.yaml
index 6963d20..7afdbc9 100644
--- a/kubernetes/consul/components/consul-server/requirements.yaml
+++ b/kubernetes/consul/components/consul-server/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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)
diff --git a/kubernetes/consul/requirements.yaml b/kubernetes/consul/requirements.yaml
index bde1c36..4d43035 100644
--- a/kubernetes/consul/requirements.yaml
+++ b/kubernetes/consul/requirements.yaml
@@ -15,15 +15,15 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: consul-server
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/consul-server'
     condition: cds-command-executor.enabled
diff --git a/kubernetes/contrib/Chart.yaml b/kubernetes/contrib/Chart.yaml
index 3eca2e3..1ab79d9 100755
--- a/kubernetes/contrib/Chart.yaml
+++ b/kubernetes/contrib/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP optional tools
 name: contrib
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/contrib/components/awx/Chart.yaml b/kubernetes/contrib/components/awx/Chart.yaml
index 1b24368..46a0d18 100755
--- a/kubernetes/contrib/components/awx/Chart.yaml
+++ b/kubernetes/contrib/components/awx/Chart.yaml
@@ -17,4 +17,4 @@
 name: awx
 sources:
   - https://github.com/ansible/awx
-version: 7.0.0
+version: 8.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 c68cf09..d21f2d4 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Ansible AWX database
 name: awx-postgres
-version: 7.0.0
+version: 8.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 76a280b..d6f5f56 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/contrib/components/awx/requirements.yaml b/kubernetes/contrib/components/awx/requirements.yaml
index 60d7c30..b015bd1 100755
--- a/kubernetes/contrib/components/awx/requirements.yaml
+++ b/kubernetes/contrib/components/awx/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: awx-postgres
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/awx-postgres'
diff --git a/kubernetes/contrib/components/ejbca/Chart.yaml b/kubernetes/contrib/components/ejbca/Chart.yaml
index e359859..2a0b4f3 100644
--- a/kubernetes/contrib/components/ejbca/Chart.yaml
+++ b/kubernetes/contrib/components/ejbca/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP EJBCA test server
 name: ejbca
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/contrib/components/ejbca/requirements.yaml b/kubernetes/contrib/components/ejbca/requirements.yaml
index 6474557..31db08a 100644
--- a/kubernetes/contrib/components/ejbca/requirements.yaml
+++ b/kubernetes/contrib/components/ejbca/requirements.yaml
@@ -13,16 +13,16 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/Chart.yaml b/kubernetes/contrib/components/netbox/Chart.yaml
index 16cdd89..43d82f4 100755
--- a/kubernetes/contrib/components/netbox/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Netbox IPAM
 name: netbox
-version: 7.0.0
+version: 8.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 689fbde..8fa1585 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Netbox - Application (WSGI + Gunicorn)
 name: netbox-app
-version: 7.0.0
+version: 8.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 d594ed1..50ff87c 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.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 cbaca16..d7e8218 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Netbox - Nginx web server
 name: netbox-nginx
-version: 7.0.0
+version: 8.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 d594ed1..50ff87c 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.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 ade6aa0..5e4a792 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Netbox Posgres database
 name: netbox-postgres
-version: 7.0.0
+version: 8.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 d594ed1..50ff87c 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/requirements.yaml b/kubernetes/contrib/components/netbox/requirements.yaml
index b929a5c..7b63a82 100755
--- a/kubernetes/contrib/components/netbox/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/requirements.yaml
@@ -14,17 +14,17 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: netbox-app
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/netbox-app'
   - name: netbox-nginx
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/netbox-nginx'
   - name: netbox-postgres
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/netbox-postgres'
diff --git a/kubernetes/contrib/requirements.yaml b/kubernetes/contrib/requirements.yaml
index 7bbe596..20573f8 100644
--- a/kubernetes/contrib/requirements.yaml
+++ b/kubernetes/contrib/requirements.yaml
@@ -14,20 +14,20 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: awx
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/awx'
     condition: awx.enabled
   - name: ejbca
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/ejbca'
     condition: global.cmpv2Enabled
   - name: netbox
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/netbox'
     condition: netbox.enabled
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/cps/Chart.yaml b/kubernetes/cps/Chart.yaml
index c723bae..325f26d 100644
--- a/kubernetes/cps/Chart.yaml
+++ b/kubernetes/cps/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Configuration Persistance Service (CPS)
 name: cps
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/cps/requirements.yaml b/kubernetes/cps/requirements.yaml
index ce06a4d..d6b6712 100644
--- a/kubernetes/cps/requirements.yaml
+++ b/kubernetes/cps/requirements.yaml
@@ -14,17 +14,17 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: postgres
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: serviceAccount
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index 6f0d065..32f88ce 100644
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -19,4 +19,4 @@
 appVersion: "Honolulu"
 description: DCAE Microservices
 name: dcaegen2-services
-version: 7.0.0
+version: 8.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 5a15ea9..ddf976e 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
@@ -19,4 +19,4 @@
 appVersion: "Honolulu"
 description: DCAE Microservices Common templates
 name: dcaegen2-services-common
-version: 7.0.0
+version: 8.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 bf6b86b..c903638 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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 24eb2c3..a5af26c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
@@ -19,4 +19,4 @@
 appVersion: "Honolulu"
 description: DCAE HV VES collector
 name: dcae-hv-ves-collector
-version: 7.0.0
+version: 8.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 e7601ce..639fc2c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/requirements.yaml
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../common/dcaegen2-services-common'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
index d887ffe..8a6ca89 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
@@ -21,4 +21,4 @@
 appVersion: "Honolulu"
 description: ONAP DCAE Microservice Health Check
 name: dcae-ms-healthcheck
-version: 7.0.0
+version: 8.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 aadca0d..0697ceb 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/requirements.yaml
@@ -18,8 +18,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 952cee6..7030324 100644
--- a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
@@ -19,4 +19,4 @@
 appVersion: "Honolulu"
 description: DCAE PRH
 name: dcae-prh
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml
index e7601ce..639fc2c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/requirements.yaml
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../common/dcaegen2-services-common'
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
index 3ccec92..99d3c3d 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
@@ -19,4 +19,4 @@
 appVersion: "Honolulu"
 description: DCAE TCA (Gen 2)
 name: dcae-tcagen2
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml
index 6f98a22..021c357 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/requirements.yaml
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../common/dcaegen2-services-common'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
index 1ab6abd..851896c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
@@ -19,4 +19,4 @@
 appVersion: "Honolulu"
 description: DCAE VES Collector
 name: dcae-ves-collector
-version: 7.0.0
+version: 8.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 e7601ce..639fc2c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/requirements.yaml
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: dcaegen2-services-common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../common/dcaegen2-services-common'
diff --git a/kubernetes/dcaegen2-services/requirements.yaml b/kubernetes/dcaegen2-services/requirements.yaml
index 14918af..a673a97 100644
--- a/kubernetes/dcaegen2-services/requirements.yaml
+++ b/kubernetes/dcaegen2-services/requirements.yaml
@@ -14,25 +14,25 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: dcae-ms-healthcheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-ms-healthcheck'
     condition: dcae-ms-healthcheck.enabled
   - name: dcae-prh
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-prh'
     condition: dcae-bootstrap.enabled
   - name: dcae-tcagen2
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-tcagen2'
     condition: dcae-tcagen2.enabled
   - name: dcae-ves-collector
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-ves-collector'
     condition: dcae-ves-collector.enabled
   - name: dcae-hv-ves-collector
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-hv-ves-collector'
     condition: dcae-hv-ves-collector.enabled
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index 9e5ef7d..35c9249 100644
--- a/kubernetes/dcaegen2/Chart.yaml
+++ b/kubernetes/dcaegen2/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP DCAE Gen2
 name: dcaegen2
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
index 903c476..c872e2e 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE Bootstrap
 name: dcae-bootstrap
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
index f34c8dd..353f4ea 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
@@ -20,15 +20,15 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: postgres
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     alias: postgres
   - name: mongo
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 45d1d78..771d6a0 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE Cloudify Manager
 name: dcae-cloudify-manager
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
index c06e459..413f997 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml
@@ -16,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: cmpv2Config
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.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 fe4fb35..b5da7f3 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE Config Binding Service
 name: dcae-config-binding-service
-version: 7.0.0
+version: 8.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 af43e0f..be5f059 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
index a6bb766..7a67595 100644
--- a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
@@ -2,4 +2,4 @@
 appVersion: "1.0"
 description: DCAE Dashboard
 name: dcae-dashboard
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
index 4de0887..2fe8479 100644
--- a/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: postgres
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 ad7b628..c3f0fa1 100644
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE Deployment Handler
 name: dcae-deployment-handler
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
index 05a9d34..f19e412 100644
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
index 0b98bb9..0a0e942 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE Health Check
 name: dcae-healthcheck
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
index aadca0d..0697ceb 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml
@@ -18,8 +18,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 81ad6f6..abd65d6 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE Inventory API Service
 name: dcae-inventory-api
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
index 181a820..63ac56c 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml
@@ -15,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: postgres
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 aefbe49..e1d41f2 100644
--- a/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE Policy Handler
 name: dcae-policy-handler
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
index 05a9d34..f19e412 100644
--- a/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 1d8a48d..61b98a7 100644
--- a/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE Service Change Handler
 name: dcae-servicechange-handler
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
index 0328610..be5f059 100644
--- a/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 1ba7695..ae17610 100644
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE VES OpenApi Manager
 name: dcae-ves-openapi-manager
-version: 7.0.0
+version: 8.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 628b6d5..16f38f8 100644
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/requirements.yaml
@@ -16,11 +16,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/requirements.yaml b/kubernetes/dcaegen2/requirements.yaml
index eaf9549..206cfd0 100644
--- a/kubernetes/dcaegen2/requirements.yaml
+++ b/kubernetes/dcaegen2/requirements.yaml
@@ -15,45 +15,45 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: dcae-bootstrap
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-bootstrap'
     condition: dcae-bootstrap.enabled
   - name: dcae-cloudify-manager
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-cloudify-manager'
     condition: dcae-cloudify-manager.enabled
   - name: dcae-config-binding-service
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-config-binding-service'
     condition: dcae-config-binding-service.enabled
   - name: dcae-healthcheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-healthcheck'
     condition: dcae-healthcheck.enabled
   - name: dcae-servicechange-handler
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-servicechange-handler'
     condition: dcae-servicechange-handler.enabled
   - name: dcae-inventory-api
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-inventory-api'
     condition: dcae-inventory-api.enabled
   - name: dcae-deployment-handler
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-deployment-handler'
     condition: dcae-deployment-handler.enabled
   - name: dcae-policy-handler
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-policy-handler'
     condition: dcae-policy-handler.enabled
   - name: dcae-dashboard
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dcae-dashboard'
     condition: dcae-dashboard.enabled
   - name: dcae-ves-openapi-manager
-    version: ~7.x-0
+    version: ~8.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 566f7a5..b5d84f6 100644
--- a/kubernetes/dcaemod/Chart.yaml
+++ b/kubernetes/dcaemod/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD
 name: dcaemod
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
index 85bd979..c6572de 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: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
index 81c0101..0972e6b 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml
@@ -17,8 +17,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 ef3377a..9245bc9 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Distributor API
 name: dcaemod-distributor-api
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
index b5ffe20..b242fbf 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml
@@ -17,8 +17,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
index 3c49ee9..e1885a2 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Genprocessor
 name: dcaemod-genprocessor
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
index b5ffe20..b242fbf 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml
@@ -17,8 +17,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
index a77d639..929eb67 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Health Check
 name: dcaemod-healthcheck
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
index aadca0d..0697ceb 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml
@@ -18,8 +18,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 13d7ad9..cf1b896 100644
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Nifi Registry
 name: dcaemod-nifi-registry
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
index b5ffe20..b242fbf 100644
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml
@@ -17,8 +17,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 8a67ebd..ec660c2 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Onboarding API
 name: dcaemod-onboarding-api
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
index 97217ba..7416c8c 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml
@@ -17,11 +17,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: postgres
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 7acd9ad..cb7715e 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE MOD Runtime API
 name: dcaemod-runtime-api
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
index ed01649..b242fbf 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml
@@ -17,9 +17,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
-
diff --git a/kubernetes/dcaemod/requirements.yaml b/kubernetes/dcaemod/requirements.yaml
index 0af4319..649e3be 100644
--- a/kubernetes/dcaemod/requirements.yaml
+++ b/kubernetes/dcaemod/requirements.yaml
@@ -14,33 +14,33 @@
 
 dependencies:
     - name: common
-      version: ~7.x-0
+      version: ~8.x-0
       repository: '@local'
     - name: dcaemod-genprocessor
-      version: ~7.x-0
+      version: ~8.x-0
       repository: 'file://components/dcaemod-genprocessor'
       condition: dcaemod-genprocessor.enabled
     - name: dcaemod-distributor-api
-      version: ~7.x-0
+      version: ~8.x-0
       repository: 'file://components/dcaemod-distributor-api'
       condition: dcaemod-distributor-api.enabled
     - name: dcaemod-designtool
-      version: ~7.x-0
+      version: ~8.x-0
       repository: 'file://components/dcaemod-designtool'
       condition: dcaemod-designtool.enabled
     - name: dcaemod-onboarding-api
-      version: ~7.x-0
+      version: ~8.x-0
       repository: 'file://components/dcaemod-onboarding-api'
       condition: dcaemod-onboarding-api.enabled
     - name: dcaemod-runtime-api
-      version: ~7.x-0
+      version: ~8.x-0
       repository: 'file://components/dcaemod-runtime-api'
       condition: dcaemod-runtime-api.enabled
     - name: dcaemod-nifi-registry
-      version: ~7.x-0
+      version: ~8.x-0
       repository: 'file://components/dcaemod-nifi-registry'
       condition: dcaemod-nifi-registry.enabled
     - name: dcaemod-healthcheck
-      version: ~7.x-0
+      version: ~8.x-0
       repository: 'file://components/dcaemod-healthcheck'
-      condition: dcaemod-healthcheck.enabled
\ No newline at end of file
+      condition: dcaemod-healthcheck.enabled
diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml
index 1656ada..c57858d 100644
--- a/kubernetes/dmaap/Chart.yaml
+++ b/kubernetes/dmaap/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP DMaaP components
 name: dmaap
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
index 86bdbb3..0b6b3bf 100644
--- a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
 name: dmaap-bc
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
index 5a386b1..95f8416 100644
--- a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
@@ -14,15 +14,15 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: postgres
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: PG.enabled
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 58ed1d8..bc9a734 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP DMaaP Data Router Node Server
 name: dmaap-dr-node
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
index 5773980..d96058d 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
@@ -20,8 +20,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 65effe0..5b0666e 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP DMaaP Data Router Provisioning Server
 name: dmaap-dr-prov
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
index b6997b9..ed03e05 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
@@ -20,15 +20,15 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mariadb-galera
     alias: mariadb
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/Chart.yaml b/kubernetes/dmaap/components/message-router/Chart.yaml
index 3f1c509..637395f 100644
--- a/kubernetes/dmaap/components/message-router/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Message Router
 name: message-router
-version: 7.0.0
+version: 8.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 83700a7..3e4bb7f 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
@@ -16,5 +16,4 @@
 apiVersion: v1
 description: ONAP Message Router Kafka Service
 name: message-router-kafka
-version: 7.0.0
-
+version: 8.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 21c9afa..343812d 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
@@ -15,12 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.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 60cea85..566d14f 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
@@ -16,5 +16,4 @@
 apiVersion: v1
 description: ONAP Dmaap Message Router Zookeeper Service
 name: message-router-zookeeper
-version: 7.0.0
-
+version: 8.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 21c9afa..343812d 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
@@ -15,12 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
-
diff --git a/kubernetes/dmaap/components/message-router/requirements.yaml b/kubernetes/dmaap/components/message-router/requirements.yaml
index a46aa42..fd0ae68 100644
--- a/kubernetes/dmaap/components/message-router/requirements.yaml
+++ b/kubernetes/dmaap/components/message-router/requirements.yaml
@@ -15,17 +15,17 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: message-router-kafka
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/message-router-kafka'
   - name: message-router-zookeeper
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/message-router-zookeeper'
diff --git a/kubernetes/dmaap/requirements.yaml b/kubernetes/dmaap/requirements.yaml
index 6904e68..d622734 100644
--- a/kubernetes/dmaap/requirements.yaml
+++ b/kubernetes/dmaap/requirements.yaml
@@ -15,21 +15,21 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: message-router
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/message-router'
     condition: message-router.enabled
   - name: dmaap-bc
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dmaap-bc'
     condition: dmaap-bc.enabled
   - name: dmaap-dr-node
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dmaap-dr-node'
     condition: dmaap-dr-node.enabled
   - name: dmaap-dr-prov
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dmaap-dr-prov'
     condition: dmaap-dr-prov.enabled
diff --git a/kubernetes/esr/Chart.yaml b/kubernetes/esr/Chart.yaml
index b1c100b..79b2875 100644
--- a/kubernetes/esr/Chart.yaml
+++ b/kubernetes/esr/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP External System Register
 name: esr
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/esr/components/esr-gui/Chart.yaml b/kubernetes/esr/components/esr-gui/Chart.yaml
index 8794421..9f08c59 100644
--- a/kubernetes/esr/components/esr-gui/Chart.yaml
+++ b/kubernetes/esr/components/esr-gui/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP External System Register GUI
 name: esr-gui
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/esr/components/esr-gui/requirements.yaml b/kubernetes/esr/components/esr-gui/requirements.yaml
index 2161e6e..343812d 100644
--- a/kubernetes/esr/components/esr-gui/requirements.yaml
+++ b/kubernetes/esr/components/esr-gui/requirements.yaml
@@ -15,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/esr/components/esr-server/Chart.yaml b/kubernetes/esr/components/esr-server/Chart.yaml
index 9cd8ba3..38a51cd 100644
--- a/kubernetes/esr/components/esr-server/Chart.yaml
+++ b/kubernetes/esr/components/esr-server/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP External System Register GUI
 name: esr-server
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/esr/components/esr-server/requirements.yaml b/kubernetes/esr/components/esr-server/requirements.yaml
index 2161e6e..343812d 100644
--- a/kubernetes/esr/components/esr-server/requirements.yaml
+++ b/kubernetes/esr/components/esr-server/requirements.yaml
@@ -15,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/esr/requirements.yaml b/kubernetes/esr/requirements.yaml
index 1617572..a2bf902 100644
--- a/kubernetes/esr/requirements.yaml
+++ b/kubernetes/esr/requirements.yaml
@@ -15,9 +15,9 @@
 
 dependencies:
   - name: esr-gui
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/esr-gui'
     condition: esr-gui.enabled
   - name: esr-server
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/esr-server'
diff --git a/kubernetes/helm/starters/onap-app/Chart.yaml b/kubernetes/helm/starters/onap-app/Chart.yaml
index 435c05d..d039f44 100644
--- a/kubernetes/helm/starters/onap-app/Chart.yaml
+++ b/kubernetes/helm/starters/onap-app/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: <Short application description - this is visible via 'helm search'>
 name: <onap-app>
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/helm/starters/onap-app/requirements.yaml b/kubernetes/helm/starters/onap-app/requirements.yaml
index 5422be8..bdf33d5 100644
--- a/kubernetes/helm/starters/onap-app/requirements.yaml
+++ b/kubernetes/helm/starters/onap-app/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/log/Chart.yaml b/kubernetes/log/Chart.yaml
index 7d53ecd..7a183f6 100644
--- a/kubernetes/log/Chart.yaml
+++ b/kubernetes/log/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Logging ElasticStack
 name: log
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/log/components/log-elasticsearch/Chart.yaml b/kubernetes/log/components/log-elasticsearch/Chart.yaml
index 0ca88f5..6ea1c79 100644
--- a/kubernetes/log/components/log-elasticsearch/Chart.yaml
+++ b/kubernetes/log/components/log-elasticsearch/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Logging Elasticsearch
 name: log-elasticsearch
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/log/components/log-elasticsearch/requirements.yaml b/kubernetes/log/components/log-elasticsearch/requirements.yaml
index 0328610..be5f059 100644
--- a/kubernetes/log/components/log-elasticsearch/requirements.yaml
+++ b/kubernetes/log/components/log-elasticsearch/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/log/components/log-kibana/Chart.yaml b/kubernetes/log/components/log-kibana/Chart.yaml
index 96a2c82..0b8c432 100644
--- a/kubernetes/log/components/log-kibana/Chart.yaml
+++ b/kubernetes/log/components/log-kibana/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Logging Kibana
 name: log-kibana
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/log/components/log-kibana/requirements.yaml b/kubernetes/log/components/log-kibana/requirements.yaml
index 0328610..be5f059 100644
--- a/kubernetes/log/components/log-kibana/requirements.yaml
+++ b/kubernetes/log/components/log-kibana/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/log/components/log-logstash/Chart.yaml b/kubernetes/log/components/log-logstash/Chart.yaml
index b6b39d7..543b1f5 100644
--- a/kubernetes/log/components/log-logstash/Chart.yaml
+++ b/kubernetes/log/components/log-logstash/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Logging Logstash
 name: log-logstash
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/log/components/log-logstash/requirements.yaml b/kubernetes/log/components/log-logstash/requirements.yaml
index 0328610..be5f059 100644
--- a/kubernetes/log/components/log-logstash/requirements.yaml
+++ b/kubernetes/log/components/log-logstash/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/log/requirements.yaml b/kubernetes/log/requirements.yaml
index 4455af6..aba35bc 100644
--- a/kubernetes/log/requirements.yaml
+++ b/kubernetes/log/requirements.yaml
@@ -14,18 +14,17 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: log-elasticsearch
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/log-elasticsearch'
   - name: log-kibana
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/log-kibana'
   - name: log-logstash
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/log-logstash'
-
diff --git a/kubernetes/modeling/Chart.yaml b/kubernetes/modeling/Chart.yaml
index 93bd4a4..ea1e28b 100644
--- a/kubernetes/modeling/Chart.yaml
+++ b/kubernetes/modeling/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Modeling (Modeling)
 name: modeling
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
index 58ece12..fcac20b 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Modeling - Etsicatalog
 name: modeling-etsicatalog
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml b/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
index 6f3e850..b9e4a44 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml
@@ -14,19 +14,19 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: readinessCheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/modeling/requirements.yaml b/kubernetes/modeling/requirements.yaml
index d4b6c46..e2f7a75 100644
--- a/kubernetes/modeling/requirements.yaml
+++ b/kubernetes/modeling/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: modeling-etsicatalog
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/modeling-etsicatalog'
diff --git a/kubernetes/msb/Chart.yaml b/kubernetes/msb/Chart.yaml
index 0123596..9c9ae56 100644
--- a/kubernetes/msb/Chart.yaml
+++ b/kubernetes/msb/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus
 name: msb
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/msb/components/kube2msb/Chart.yaml b/kubernetes/msb/components/kube2msb/Chart.yaml
index 10c9818..70dd462 100644
--- a/kubernetes/msb/components/kube2msb/Chart.yaml
+++ b/kubernetes/msb/components/kube2msb/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Kube2MSB Registrator
 name: kube2msb
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/msb/components/kube2msb/requirements.yaml b/kubernetes/msb/components/kube2msb/requirements.yaml
index 467a52a..f783c76 100644
--- a/kubernetes/msb/components/kube2msb/requirements.yaml
+++ b/kubernetes/msb/components/kube2msb/requirements.yaml
@@ -13,8 +13,8 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/msb/components/msb-consul/Chart.yaml b/kubernetes/msb/components/msb-consul/Chart.yaml
index fc4f224..9666dc6 100644
--- a/kubernetes/msb/components/msb-consul/Chart.yaml
+++ b/kubernetes/msb/components/msb-consul/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Consul
 name: msb-consul
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/msb/components/msb-consul/requirements.yaml b/kubernetes/msb/components/msb-consul/requirements.yaml
index 467a52a..f783c76 100644
--- a/kubernetes/msb/components/msb-consul/requirements.yaml
+++ b/kubernetes/msb/components/msb-consul/requirements.yaml
@@ -13,8 +13,8 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/msb/components/msb-discovery/Chart.yaml b/kubernetes/msb/components/msb-discovery/Chart.yaml
index 527af56..50465b9 100644
--- a/kubernetes/msb/components/msb-discovery/Chart.yaml
+++ b/kubernetes/msb/components/msb-discovery/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Discovery
 name: msb-discovery
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/msb/components/msb-discovery/requirements.yaml b/kubernetes/msb/components/msb-discovery/requirements.yaml
index 467a52a..f783c76 100644
--- a/kubernetes/msb/components/msb-discovery/requirements.yaml
+++ b/kubernetes/msb/components/msb-discovery/requirements.yaml
@@ -13,8 +13,8 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/msb/components/msb-eag/Chart.yaml b/kubernetes/msb/components/msb-eag/Chart.yaml
index c184362..8557bf2 100644
--- a/kubernetes/msb/components/msb-eag/Chart.yaml
+++ b/kubernetes/msb/components/msb-eag/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Internal API Gateway
 name: msb-eag
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/msb/components/msb-eag/requirements.yaml b/kubernetes/msb/components/msb-eag/requirements.yaml
index fe55201..1a256d1 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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/msb/components/msb-iag/Chart.yaml b/kubernetes/msb/components/msb-iag/Chart.yaml
index 9b8d56c..ceec797 100644
--- a/kubernetes/msb/components/msb-iag/Chart.yaml
+++ b/kubernetes/msb/components/msb-iag/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Internal API Gateway
 name: msb-iag
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/msb/components/msb-iag/requirements.yaml b/kubernetes/msb/components/msb-iag/requirements.yaml
index fe55201..1a256d1 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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/msb/requirements.yaml b/kubernetes/msb/requirements.yaml
index b335bfa..f365479 100644
--- a/kubernetes/msb/requirements.yaml
+++ b/kubernetes/msb/requirements.yaml
@@ -14,23 +14,23 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: kube2msb
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/kube2msb'
   - name: msb-consul
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/msb-consul'
   - name: msb-discovery
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/msb-discovery'
   - name: msb-eag
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/msb-eag'
   - name: msb-iag
-    version: ~7.x-0
-    repository: 'file://components/msb-iag'
\ No newline at end of file
+    version: ~8.x-0
+    repository: 'file://components/msb-iag'
diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index 9fb7077..8093d70 100644
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud broker
 name: multicloud
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/multicloud/components/multicloud-azure/Chart.yaml b/kubernetes/multicloud/components/multicloud-azure/Chart.yaml
index 38ebed0..1a1fd9a 100644
--- a/kubernetes/multicloud/components/multicloud-azure/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-azure/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud Azure plugin
 name: multicloud-azure
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/multicloud/components/multicloud-azure/requirements.yaml b/kubernetes/multicloud/components/multicloud-azure/requirements.yaml
index 0328610..be5f059 100644
--- a/kubernetes/multicloud/components/multicloud-azure/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-azure/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
index c65ffa4..95b82ab 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack fcaps Plugin
 name: multicloud-fcaps
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
index 0328610..be5f059 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
index e80e167..105721c 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Multicloud Kubernetes Plugin
 name: multicloud-k8s
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
index b6521b3..acbc39b 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
@@ -14,17 +14,17 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: etcd
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
index 7bad830..19f24e3 100644
--- a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack Pike Plugin
 name: multicloud-pike
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
index 0328610..be5f059 100644
--- a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
index 7c2b293..4280c33 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Multicloud Prometheus
 name: multicloud-prometheus
-version: 7.0.0
+version: 8.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 d041498..203c6ee 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Multicloud Prometheus Alert Manager
 name: prometheus-alertmanager
-version: 7.0.0
+version: 8.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 164e6a0..7ae66c6 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Multicloud Grafana for Prometheus
 name: prometheus-grafana
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
index b17f270..fb61cca 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
@@ -15,14 +15,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: prometheus-alertmanager
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/prometheus-alertmanager'
   - name: prometheus-grafana
-    version: ~7.x-0
-    repository: 'file://components/prometheus-grafana'
\ No newline at end of file
+    version: ~8.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 6b82867..9c6ce77 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack Starlingx Plugin
 name: multicloud-starlingx
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
index 0328610..be5f059 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
index fa5ba3e..df18003 100644
--- a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud VIO plugin
 name: multicloud-vio
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
index 0328610..be5f059 100644
--- a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
index 3627165..ddeca7c 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack WindRiver Plugin
 name: multicloud-windriver
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
index 0328610..be5f059 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/requirements.yaml b/kubernetes/multicloud/requirements.yaml
index 12b0fea..9c01764 100644
--- a/kubernetes/multicloud/requirements.yaml
+++ b/kubernetes/multicloud/requirements.yaml
@@ -15,40 +15,40 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: multicloud-azure
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/multicloud-azure'
     condition: multicloud-azure.enabled
   - name: multicloud-fcaps
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/multicloud-fcaps'
     condition: multicloud-fcaps.enabled
   - name: multicloud-k8s
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/multicloud-k8s'
     condition: multicloud-k8s.enabled
   - name: multicloud-pike
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/multicloud-pike'
     condition: multicloud-pike.enabled
   - name: multicloud-prometheus
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/multicloud-prometheus'
     condition: multicloud-prometheus.enabled
   - name: multicloud-starlingx
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/multicloud-starlingx'
     condition: multicloud-starlingx.enabled
   - name: multicloud-vio
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/multicloud-vio'
     condition: multicloud-vio.enabled
   - name: multicloud-windriver
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/multicloud-windriver'
     condition: multicloud-windriver.enabled
diff --git a/kubernetes/nbi/Chart.yaml b/kubernetes/nbi/Chart.yaml
index d30b4f1..562714c 100644
--- a/kubernetes/nbi/Chart.yaml
+++ b/kubernetes/nbi/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Northbound Interface
 name: nbi
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/nbi/requirements.yaml b/kubernetes/nbi/requirements.yaml
index 1efd721..7062a13 100644
--- a/kubernetes/nbi/requirements.yaml
+++ b/kubernetes/nbi/requirements.yaml
@@ -15,25 +15,25 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mongo
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index fceda43..94bf304 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -14,7 +14,7 @@
 
 apiVersion: v1
 name: onap
-version: 7.0.0
+version: 8.0.0
 appVersion: Guilin
 description: Open Network Automation Platform (ONAP)
 home: https://www.onap.org/
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 68146fe..ecc1565 100755
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -20,148 +20,148 @@
 # > helm repo add local http://127.0.0.1:8879
 dependencies:
   - name: aaf
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: aaf.enabled
   - name: aai
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: aai.enabled
   - name: appc
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: appc.enabled
   - name: cassandra
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: cassandra.enabled
   - name: cds
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: cds.enabled
   - name: cli
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: cli.enabled
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: consul
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: consul.enabled
   - name: contrib
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: global.addTestingComponents
   - name: cps
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: cps.enabled
   - name: dcaegen2
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: dcaegen2.enabled
   - name: dcaegen2-services
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: dcaegen2-services.enabled
   - name: dcaemod
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: dcaemod.enabled
   - name: dmaap
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: dmaap.enabled
   - name: esr
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: esr.enabled
   - name: log
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: log.enabled
   - name: sniro-emulator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: sniro-emulator.enabled
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: mariadb-galera.enabled
   - name: msb
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: msb.enabled
   - name: multicloud
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: multicloud.enabled
   - name: nbi
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: nbi.enabled
   - name: policy
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: policy.enabled
   - name: portal
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: portal.enabled
   - name: oof
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: oof.enabled
   - name: repository-wrapper
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: robot
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: robot.enabled
   - name: sdc
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: sdc.enabled
   - name: sdnc
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: sdnc.enabled
   - name: so
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: so.enabled
   - name: uui
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: uui.enabled
   - name: vfc
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: vfc.enabled
   - name: vid
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: vid.enabled
   - name: vnfsdk
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: vnfsdk.enabled
   - name: modeling
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: modeling.enabled
   - name: platform
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: platform.enabled
   - name: a1policymanagement
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: a1policymanagement.enabled
   - name: cert-wrapper
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: cert-wrapper.enabled
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 30155dc..6ff7d13 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -103,7 +103,7 @@
   nginxImage: bitnami/nginx:1.18-debian-10
 
   # postgreSQL client and server image
-  postgresImage: crunchydata/crunchy-postgres:centos7-10.11-4.2.1
+  postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
 
   # readiness check image
   readinessImage: onap/oom/readiness:3.0.1
diff --git a/kubernetes/oof/Chart.yaml b/kubernetes/oof/Chart.yaml
index a19fdfd..382b400 100755
--- a/kubernetes/oof/Chart.yaml
+++ b/kubernetes/oof/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Optimization Framework
 name: oof
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/oof/components/oof-cmso/Chart.yaml b/kubernetes/oof/components/oof-cmso/Chart.yaml
index 56f98ca..c1fa86c 100644
--- a/kubernetes/oof/components/oof-cmso/Chart.yaml
+++ b/kubernetes/oof/components/oof-cmso/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Chart for Change Management Service Orchestrator (CMSO)
 name: oof-cmso
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/Chart.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/Chart.yaml
index baa5af7..8cd7c2f 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/Chart.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Chart for Change Management Service Orchestrator (CMSO) Optimizer
 name: oof-cmso-optimizer
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/requirements.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/requirements.yaml
index d6eecb7..2159c5f 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/requirements.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/Chart.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/Chart.yaml
index e472bc0..698166e 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/Chart.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Chart for Change Management Service Orchestrator (CMSO) Service
 name: oof-cmso-service
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/requirements.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/requirements.yaml
index 8dfadb0..2159c5f 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/requirements.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/Chart.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/Chart.yaml
index 78d6b7b..b37f144 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/Chart.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Chart for Change Management Service Orchestrator (CMSO) Ticket Management
 name: oof-cmso-ticketmgt
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/requirements.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/requirements.yaml
index 8dfadb0..2159c5f 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/requirements.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/Chart.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/Chart.yaml
index e426474..c3b9e69 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/Chart.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Chart for Change Management Service Orchestrator (CMSO) Service
 name: oof-cmso-topology
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/requirements.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/requirements.yaml
index 8dfadb0..2159c5f 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/requirements.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-cmso/requirements.yaml b/kubernetes/oof/components/oof-cmso/requirements.yaml
index 0222215..535a1e1 100644
--- a/kubernetes/oof/components/oof-cmso/requirements.yaml
+++ b/kubernetes/oof/components/oof-cmso/requirements.yaml
@@ -15,33 +15,33 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mariadb-init
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: oof-cmso-optimizer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-cmso-optimizer'
     condition: oof-cmso-optimizer.enabled
   - name: oof-cmso-service
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-cmso-service'
     condition: oof-cmso-service.enabled
   - name: oof-cmso-ticketmgt
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-cmso-ticketmgt'
     condition: oof-cmso-ticketmgt.enabled
   - name: oof-cmso-topology
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-cmso-topology'
     condition: oof-cmso-topology.enabled
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/Chart.yaml b/kubernetes/oof/components/oof-has/Chart.yaml
index 15d826d..c76136d 100755
--- a/kubernetes/oof/components/oof-has/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Service
 name: oof-has
-version: 7.0.0
+version: 8.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 a22895d..be6442e 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
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Servicei - API
 name: oof-has-api
-version: 7.0.0
+version: 8.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 5d047e1..de5d276 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
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 f482907..5f88b8e 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
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Sservice - Controller
 name: oof-has-controller
-version: 7.0.0
+version: 8.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 0925692..b87d5ad 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
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 8b8255e..83d99cb 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
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Service - Data Component
 name: oof-has-data
-version: 7.0.0
+version: 8.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 0925692..b87d5ad 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
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 31becd7..a319abd 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
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Sevice - Reservation Component
 name: oof-has-reservation
-version: 7.0.0
+version: 8.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 0925692..b87d5ad 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
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 6e3afa9..8ca0aeb 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
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Service - Solver Component
 name: oof-has-solver
-version: 7.0.0
+version: 8.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 0925692..b87d5ad 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
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: oof-templates
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../../../oof-templates'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/requirements.yaml b/kubernetes/oof/components/oof-has/requirements.yaml
index e223876..851211a 100755
--- a/kubernetes/oof/components/oof-has/requirements.yaml
+++ b/kubernetes/oof/components/oof-has/requirements.yaml
@@ -15,31 +15,31 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: music
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: oof-has-api
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-has-api'
     condition: oof-has-api.enabled
   - name: oof-has-controller
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-has-controller'
     condition: oof-has-controller.enabled
   - name: oof-has-data
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-has-data'
     condition: oof-has-data.enabled
   - name: oof-has-reservation
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-has-reservation'
     condition: oof-has-reservation.enabled
   - name: oof-has-solver
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-has-solver'
     condition: oof-has-solver.enabled
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/oof/components/oof-templates/Chart.yaml b/kubernetes/oof/components/oof-templates/Chart.yaml
index 2c0af90..4d7e4a8 100755
--- a/kubernetes/oof/components/oof-templates/Chart.yaml
+++ b/kubernetes/oof/components/oof-templates/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP OOF helm templates
 name: oof-templates
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/oof/components/oof-templates/requirements.yaml b/kubernetes/oof/components/oof-templates/requirements.yaml
index 0205417..000e524 100755
--- a/kubernetes/oof/components/oof-templates/requirements.yaml
+++ b/kubernetes/oof/components/oof-templates/requirements.yaml
@@ -15,6 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
-
diff --git a/kubernetes/oof/requirements.yaml b/kubernetes/oof/requirements.yaml
index f3e8271..7c00c3f 100755
--- a/kubernetes/oof/requirements.yaml
+++ b/kubernetes/oof/requirements.yaml
@@ -15,22 +15,22 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: oof-cmso
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-cmso'
     condition: oof-cmso.enabled
   - name: oof-has
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-has'
     condition: oof-has.enabled
   - name: oof-templates
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oof-templates'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/platform/Chart.yaml b/kubernetes/platform/Chart.yaml
index 29adab7..56df595 100644
--- a/kubernetes/platform/Chart.yaml
+++ b/kubernetes/platform/Chart.yaml
@@ -17,4 +17,4 @@
 apiVersion: v1
 description: ONAP platform components
 name: platform
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml b/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
index 38446f1..0e6336b 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP CMPv2 certificate external provider for cert-manager
 name: cmpv2-cert-provider
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml b/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
index cd195b6..f570517 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/requirements.yaml
@@ -13,8 +13,8 @@
 
  dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~7.x-0
+    version: ~8.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 5b22232..d47226d 100644
--- a/kubernetes/platform/components/oom-cert-service/Chart.yaml
+++ b/kubernetes/platform/components/oom-cert-service/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Cert Service
 name: oom-cert-service
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/platform/components/oom-cert-service/requirements.yaml b/kubernetes/platform/components/oom-cert-service/requirements.yaml
index f1f5e64..e89dc58 100644
--- a/kubernetes/platform/components/oom-cert-service/requirements.yaml
+++ b/kubernetes/platform/components/oom-cert-service/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/platform/requirements.yaml b/kubernetes/platform/requirements.yaml
index 7ddef47..84ad7f8 100644
--- a/kubernetes/platform/requirements.yaml
+++ b/kubernetes/platform/requirements.yaml
@@ -17,8 +17,8 @@
 
 dependencies:
   - name: oom-cert-service
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/oom-cert-service'
   - name: cmpv2-cert-provider
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/cmpv2-cert-provider'
diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
index d9f7cc8..26b425f 100755
--- a/kubernetes/policy/Chart.yaml
+++ b/kubernetes/policy/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Policy
 name: policy
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
index 1659beb..6e3d678 100755
--- a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP Policy APEX PDP
 name: policy-apex-pdp
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml b/kubernetes/policy/components/policy-apex-pdp/requirements.yaml
index c83882b..1c57aa4 100755
--- a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/requirements.yaml
@@ -19,11 +19,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
index fb4742e..22edcff 100755
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -49,7 +49,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-apex-pdp:2.5.0
+image: onap/policy-apex-pdp:2.5.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-api/Chart.yaml b/kubernetes/policy/components/policy-api/Chart.yaml
index cf66146..a025e7e 100755
--- a/kubernetes/policy/components/policy-api/Chart.yaml
+++ b/kubernetes/policy/components/policy-api/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP Policy Design API
 name: policy-api
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/policy/components/policy-api/requirements.yaml b/kubernetes/policy/components/policy-api/requirements.yaml
index a020de7..7bc531a 100755
--- a/kubernetes/policy/components/policy-api/requirements.yaml
+++ b/kubernetes/policy/components/policy-api/requirements.yaml
@@ -18,11 +18,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
index 9d3ea8c..0b2ea9f 100755
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -81,7 +81,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-api:2.4.0
+image: onap/policy-api:2.4.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-clamp-be/Chart.yaml b/kubernetes/policy/components/policy-clamp-be/Chart.yaml
index fd48cc2..8ec44e0 100644
--- a/kubernetes/policy/components/policy-clamp-be/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Policy Clamp Backend
 name: policy-clamp-be
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/policy/components/policy-clamp-be/requirements.yaml b/kubernetes/policy/components/policy-clamp-be/requirements.yaml
index 734166b..88fd9d9 100644
--- a/kubernetes/policy/components/policy-clamp-be/requirements.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-be/values.yaml b/kubernetes/policy/components/policy-clamp-be/values.yaml
index cd78850..50ec8fa 100644
--- a/kubernetes/policy/components/policy-clamp-be/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/values.yaml
@@ -63,7 +63,7 @@
 flavor: small
 
 # application image
-image: onap/policy-clamp-backend:6.0.1
+image: onap/policy-clamp-backend:6.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-clamp-fe/Chart.yaml b/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
index 331ba86..2c0faa9 100644
--- a/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-fe/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Policy Clamp Frontend
 name: policy-clamp-fe
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/policy/components/policy-clamp-fe/requirements.yaml b/kubernetes/policy/components/policy-clamp-fe/requirements.yaml
index 734166b..88fd9d9 100644
--- a/kubernetes/policy/components/policy-clamp-fe/requirements.yaml
+++ b/kubernetes/policy/components/policy-clamp-fe/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-fe/values.yaml b/kubernetes/policy/components/policy-clamp-fe/values.yaml
index 15b69ef..c2f4d15 100644
--- a/kubernetes/policy/components/policy-clamp-fe/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-fe/values.yaml
@@ -62,7 +62,7 @@
 flavor: small
 
 # application image
-image: onap/policy-clamp-frontend:6.0.1
+image: onap/policy-clamp-frontend:6.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-distribution/Chart.yaml b/kubernetes/policy/components/policy-distribution/Chart.yaml
index cc50e3a..f3481e3 100755
--- a/kubernetes/policy/components/policy-distribution/Chart.yaml
+++ b/kubernetes/policy/components/policy-distribution/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP Policy Distribution
 name: policy-distribution
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/policy/components/policy-distribution/requirements.yaml b/kubernetes/policy/components/policy-distribution/requirements.yaml
index ccd9ea8..0006e49 100755
--- a/kubernetes/policy/components/policy-distribution/requirements.yaml
+++ b/kubernetes/policy/components/policy-distribution/requirements.yaml
@@ -19,11 +19,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
index 752b83c..09805bd 100755
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -67,7 +67,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-distribution:2.5.0
+image: onap/policy-distribution:2.5.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
index dc0a39a..0000e48 100755
--- a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Drools Policy Engine (PDP-D)
 name: policy-drools-pdp
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/policy/components/policy-drools-pdp/requirements.yaml b/kubernetes/policy/components/policy-drools-pdp/requirements.yaml
index 41cef52..29b1053 100755
--- a/kubernetes/policy/components/policy-drools-pdp/requirements.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/requirements.yaml
@@ -15,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index 459767e..658fa65 100755
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -34,7 +34,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pdpd-cl:1.8.0
+image: onap/policy-pdpd-cl:1.8.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -86,14 +86,15 @@
   cadi_longitude: "0.0"
   credsPath: /opt/app/osaaf/local
   app_ns: org.osaaf.aaf
-  uid: 1000
-  gid: 1000
+  uid: 100
+  gid: 101
   aaf_add_config: >
     /opt/app/aaf_config/bin/agent.sh;
     export $(/opt/app/aaf_config/bin/agent.sh local showpass
     {{ .Values.fqi }} {{ .Values.fqdn }} | grep "^cadi_keystore_password_p12");
     echo "export KEYSTORE='{{ .Values.credsPath }}/org.onap.policy.p12'" >> {{ .Values.credsPath }}/.ci;
     echo "export KEYSTORE_PASSWD='${cadi_keystore_password_p12}'" >> {{ .Values.credsPath }}/.ci;
+    echo "export CADI_KEYFILE='{{ .Values.credsPath }}/org.onap.policy.keyfile'" >> {{ .Values.credsPath }}/.ci;
     chown -R {{ .Values.uid }}:{{ .Values.gid }} $(dirname {{ .Values.credsPath }});
 
 server:
diff --git a/kubernetes/policy/components/policy-nexus/Chart.yaml b/kubernetes/policy/components/policy-nexus/Chart.yaml
index 89c6a3d..3e28bae 100755
--- a/kubernetes/policy/components/policy-nexus/Chart.yaml
+++ b/kubernetes/policy/components/policy-nexus/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Policy Nexus
 name: policy-nexus
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/policy/components/policy-nexus/requirements.yaml b/kubernetes/policy/components/policy-nexus/requirements.yaml
index 2161e6e..343812d 100755
--- a/kubernetes/policy/components/policy-nexus/requirements.yaml
+++ b/kubernetes/policy/components/policy-nexus/requirements.yaml
@@ -15,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-pap/Chart.yaml b/kubernetes/policy/components/policy-pap/Chart.yaml
index 41e8056..a3b3f18 100755
--- a/kubernetes/policy/components/policy-pap/Chart.yaml
+++ b/kubernetes/policy/components/policy-pap/Chart.yaml
@@ -20,4 +20,4 @@
 apiVersion: v1
 description: ONAP Policy Administration (PAP)
 name: policy-pap
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/policy/components/policy-pap/requirements.yaml b/kubernetes/policy/components/policy-pap/requirements.yaml
index ad7b6ad..3f0071a 100755
--- a/kubernetes/policy/components/policy-pap/requirements.yaml
+++ b/kubernetes/policy/components/policy-pap/requirements.yaml
@@ -19,11 +19,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index 42f0e13..ec177d8 100755
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -95,7 +95,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pap:2.4.0
+image: onap/policy-pap:2.4.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
index 9ac4459..cf07d84 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP Policy XACML PDP (PDP-X)
 name: policy-xacml-pdp
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml b/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
index a020de7..7bc531a 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
@@ -18,11 +18,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index 41bec0b..76b0f3a 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -86,7 +86,7 @@
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-xacml-pdp:2.4.0
+image: onap/policy-xacml-pdp:2.4.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/requirements.yaml b/kubernetes/policy/requirements.yaml
index 22e3dfa..33447a2 100755
--- a/kubernetes/policy/requirements.yaml
+++ b/kubernetes/policy/requirements.yaml
@@ -15,47 +15,47 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: policy-nexus
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/policy-nexus'
     condition: policy-nexus.enabled
   - name: policy-api
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/policy-api'
     condition: policy-api.enabled
   - name: policy-pap
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/policy-pap'
     condition: policy-pap.enabled
   - name: policy-xacml-pdp
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/policy-xacml-pdp'
     condition: policy-xacml-pdp.enabled
   - name: policy-apex-pdp
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/policy-apex-pdp'
     condition: policy-apex-pdp.enabled
   - name: policy-drools-pdp
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/policy-drools-pdp'
     condition: policy-drools-pdp.enabled
   - name: policy-distribution
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/policy-distribution'
     condition: policy-distribution.enabled
   - name: policy-clamp-be
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/policy-clamp-be'
     condition: policy-clamp-be.enabled
   - name: policy-clamp-fe
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/policy-clamp-fe'
     condition: policy-clamp-fe.enabled
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/portal/Chart.yaml b/kubernetes/portal/Chart.yaml
index e040c14..fb7d527 100644
--- a/kubernetes/portal/Chart.yaml
+++ b/kubernetes/portal/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Web Portal
 name: portal
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/portal/components/portal-app/Chart.yaml b/kubernetes/portal/components/portal-app/Chart.yaml
index 5c1b9a0..83e9847 100644
--- a/kubernetes/portal/components/portal-app/Chart.yaml
+++ b/kubernetes/portal/components/portal-app/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Portal application
 name: portal-app
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/portal/components/portal-app/requirements.yaml b/kubernetes/portal/components/portal-app/requirements.yaml
index 5b9c746..d49317d 100644
--- a/kubernetes/portal/components/portal-app/requirements.yaml
+++ b/kubernetes/portal/components/portal-app/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/portal/components/portal-cassandra/Chart.yaml b/kubernetes/portal/components/portal-cassandra/Chart.yaml
index f2f2577..f15479b 100644
--- a/kubernetes/portal/components/portal-cassandra/Chart.yaml
+++ b/kubernetes/portal/components/portal-cassandra/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Portal cassandra
 name: portal-cassandra
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/portal/components/portal-cassandra/requirements.yaml b/kubernetes/portal/components/portal-cassandra/requirements.yaml
index 21436f4..1139b8e 100644
--- a/kubernetes/portal/components/portal-cassandra/requirements.yaml
+++ b/kubernetes/portal/components/portal-cassandra/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/portal/components/portal-mariadb/Chart.yaml b/kubernetes/portal/components/portal-mariadb/Chart.yaml
index 64ffc37..5883b99 100644
--- a/kubernetes/portal/components/portal-mariadb/Chart.yaml
+++ b/kubernetes/portal/components/portal-mariadb/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: MariaDB Service
 name: portal-mariadb
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/portal/components/portal-mariadb/requirements.yaml b/kubernetes/portal/components/portal-mariadb/requirements.yaml
index 21436f4..1139b8e 100644
--- a/kubernetes/portal/components/portal-mariadb/requirements.yaml
+++ b/kubernetes/portal/components/portal-mariadb/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/portal/components/portal-sdk/Chart.yaml b/kubernetes/portal/components/portal-sdk/Chart.yaml
index 485157c..11b835d 100644
--- a/kubernetes/portal/components/portal-sdk/Chart.yaml
+++ b/kubernetes/portal/components/portal-sdk/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Portal software development kit
 name: portal-sdk
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/portal/components/portal-sdk/requirements.yaml b/kubernetes/portal/components/portal-sdk/requirements.yaml
index 5b9c746..d49317d 100644
--- a/kubernetes/portal/components/portal-sdk/requirements.yaml
+++ b/kubernetes/portal/components/portal-sdk/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/portal/components/portal-widget/Chart.yaml b/kubernetes/portal/components/portal-widget/Chart.yaml
index 7b7af72..aaac74f 100644
--- a/kubernetes/portal/components/portal-widget/Chart.yaml
+++ b/kubernetes/portal/components/portal-widget/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Portal widgets micro service application
 name: portal-widget
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/portal/components/portal-widget/requirements.yaml b/kubernetes/portal/components/portal-widget/requirements.yaml
index 21436f4..1139b8e 100644
--- a/kubernetes/portal/components/portal-widget/requirements.yaml
+++ b/kubernetes/portal/components/portal-widget/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/portal/requirements.yaml b/kubernetes/portal/requirements.yaml
index ce8bdff..4bca811 100644
--- a/kubernetes/portal/requirements.yaml
+++ b/kubernetes/portal/requirements.yaml
@@ -15,20 +15,20 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: portal-app
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/portal-app'
   - name: portal-cassandra
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/portal-cassandra'
   - name: portal-mariadb
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/portal-mariadb'
   - name: portal-sdk
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/portal-sdk'
   - name: portal-widget
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/portal-widget'
diff --git a/kubernetes/robot/Chart.yaml b/kubernetes/robot/Chart.yaml
index 577d2ab..b456b5b 100644
--- a/kubernetes/robot/Chart.yaml
+++ b/kubernetes/robot/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: A helm Chart for kubernetes-ONAP Robot
 name: robot
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/robot/requirements.yaml b/kubernetes/robot/requirements.yaml
index 1e08aaf..76fdb3f 100644
--- a/kubernetes/robot/requirements.yaml
+++ b/kubernetes/robot/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
index 50779f8..b43bcd9 100644
--- a/kubernetes/sdc/Chart.yaml
+++ b/kubernetes/sdc/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Service Design and Creation Umbrella Helm charts
 name: sdc
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/sdc/components/sdc-be/Chart.yaml b/kubernetes/sdc/components/sdc-be/Chart.yaml
index d670f1c..6b97c3b 100644
--- a/kubernetes/sdc/components/sdc-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-be/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Backend API
 name: sdc-be
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/sdc/components/sdc-be/requirements.yaml b/kubernetes/sdc/components/sdc-be/requirements.yaml
index 38e4a37..b36d051 100644
--- a/kubernetes/sdc/components/sdc-be/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-be/requirements.yaml
@@ -19,8 +19,8 @@
 
 dependencies:
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-cs/Chart.yaml b/kubernetes/sdc/components/sdc-cs/Chart.yaml
index a35ac25..cdddad7 100644
--- a/kubernetes/sdc/components/sdc-cs/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-cs/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Cassandra
 name: sdc-cs
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/sdc/components/sdc-cs/requirements.yaml b/kubernetes/sdc/components/sdc-cs/requirements.yaml
index 50d12d8..8febe6f 100644
--- a/kubernetes/sdc/components/sdc-cs/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-cs/requirements.yaml
@@ -19,8 +19,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-fe/Chart.yaml b/kubernetes/sdc/components/sdc-fe/Chart.yaml
index 6e67e04..2291ff4 100644
--- a/kubernetes/sdc/components/sdc-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-fe/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Front End
 name: sdc-fe
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/sdc/components/sdc-fe/requirements.yaml b/kubernetes/sdc/components/sdc-fe/requirements.yaml
index 38e4a37..b36d051 100644
--- a/kubernetes/sdc/components/sdc-fe/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-fe/requirements.yaml
@@ -19,8 +19,8 @@
 
 dependencies:
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.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 b14c1f3..20a8fa4 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Onboarding API
 name: sdc-onboarding-be
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml b/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml
index e17ca1c..b36d051 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml
@@ -19,8 +19,8 @@
 
 dependencies:
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 35160c1..93bbf23 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Workflow Designer backend
 name: sdc-wfd-be
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml b/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
index 38e4a37..b36d051 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml
@@ -19,8 +19,8 @@
 
 dependencies:
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.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 9cf5231..ae14eb9 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Workflow Designer frontend
 name: sdc-wfd-fe
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml b/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml
index 38e4a37..b36d051 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml
@@ -19,8 +19,8 @@
 
 dependencies:
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/sdc/requirements.yaml b/kubernetes/sdc/requirements.yaml
index aac3d46..7ed88c5 100644
--- a/kubernetes/sdc/requirements.yaml
+++ b/kubernetes/sdc/requirements.yaml
@@ -15,22 +15,22 @@
 
 dependencies:
   - name: sdc-be
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/sdc-be'
   - name: sdc-cs
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/sdc-cs'
   - name: sdc-fe
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/sdc-fe'
   - name: sdc-onboarding-be
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/sdc-onboarding-be'
   - name: sdc-wfd-be
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/sdc-wfd-be'
     condition: sdc-wfd.enabled
   - name: sdc-wfd-fe
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/sdc-wfd-fe'
-    condition: sdc-wfd.enabled
\ No newline at end of file
+    condition: sdc-wfd.enabled
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index a55d8bb..0d11afc 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: SDN Controller
 name: sdnc
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
index 0cb6c35..9c35682 100644
--- a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: SDNC DMaaP Listener
 name: dmaap-listener
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml b/kubernetes/sdnc/components/dmaap-listener/requirements.yaml
index 39a7aa5..bdf33d5 100644
--- a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 28847aa..4009467 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: SDN-C Ansible Server
 name: sdnc-ansible-server
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml
index 5422be8..bdf33d5 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
index 7719ab8..6c81785 100644
--- a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP SDNC Policy Driven Ownership Management
 name: sdnc-prom
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml
index 088d219..3f33591 100644
--- a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-web/Chart.yaml b/kubernetes/sdnc/components/sdnc-web/Chart.yaml
index fbdfaa1..3429793 100644
--- a/kubernetes/sdnc/components/sdnc-web/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: SDN-C Web Server
 name: sdnc-web
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/sdnc/components/sdnc-web/requirements.yaml b/kubernetes/sdnc/components/sdnc-web/requirements.yaml
index 0132134..7e75730 100644
--- a/kubernetes/sdnc/components/sdnc-web/requirements.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/requirements.yaml
@@ -15,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
-    repository: '@local'
\ No newline at end of file
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/sdnc/components/ueb-listener/Chart.yaml b/kubernetes/sdnc/components/ueb-listener/Chart.yaml
index 4183a86..ae53f9c 100644
--- a/kubernetes/sdnc/components/ueb-listener/Chart.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: SDNC UEB Listener
 name: ueb-listener
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/sdnc/components/ueb-listener/requirements.yaml b/kubernetes/sdnc/components/ueb-listener/requirements.yaml
index 39a7aa5..bdf33d5 100644
--- a/kubernetes/sdnc/components/ueb-listener/requirements.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml
index 27b68df..0c82f95 100644
--- a/kubernetes/sdnc/requirements.yaml
+++ b/kubernetes/sdnc/requirements.yaml
@@ -16,59 +16,57 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: cmpv2Certificate
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certManagerCertificate
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: logConfiguration
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: network-name-gen
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: network-name-gen.enabled
   - name: dgbuilder
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: dgbuilder.enabled
   - name: sdnc-prom
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: config.geoEnabled
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: elasticsearch
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: config.sdnr.enabled
   # conditions for sdnc-subcharts
   - name: dmaap-listener
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/dmaap-listener/'
     condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled
   - name: ueb-listener
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/ueb-listener/'
     condition: sdnc.ueb-listener.enabled,ueb-listener.enabled
   - name: sdnc-ansible-server
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/sdnc-ansible-server/'
     condition: sdnc.sdnc-ansible-server.enabled,sdnc-ansible-server.enabled
   - name: sdnc-web
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/sdnc-web/'
     condition: sdnc.sdnc-web.enabled,sdnc-web.enabled
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
-
-
diff --git a/kubernetes/sniro-emulator/Chart.yaml b/kubernetes/sniro-emulator/Chart.yaml
index 1b2b5cb..ae5f164 100644
--- a/kubernetes/sniro-emulator/Chart.yaml
+++ b/kubernetes/sniro-emulator/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Mock Sniro Emulator
 name: sniro-emulator
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/sniro-emulator/requirements.yaml b/kubernetes/sniro-emulator/requirements.yaml
index 1e08aaf..76fdb3f 100644
--- a/kubernetes/sniro-emulator/requirements.yaml
+++ b/kubernetes/sniro-emulator/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml
index 867996a..0aacaf2 100755
--- a/kubernetes/so/Chart.yaml
+++ b/kubernetes/so/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP Service Orchestrator
 name: so
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
index ee53cb4..d12e318 100644
--- a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: A Helm chart for so appc orchestrator
 name: so-appc-orchestrator
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/so/components/so-appc-orchestrator/requirements.yaml b/kubernetes/so/components/so-appc-orchestrator/requirements.yaml
index e8367b2..f8b1d74 100755
--- a/kubernetes/so/components/so-appc-orchestrator/requirements.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/requirements.yaml
@@ -13,14 +13,14 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-bpmn-infra/Chart.yaml b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
index 0803e4f..093ecb1 100755
--- a/kubernetes/so/components/so-bpmn-infra/Chart.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
@@ -15,4 +15,4 @@
 appVersion: "1.0"
 description: A Helm chart for SO Bpmn Infra
 name: so-bpmn-infra
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/so/components/so-bpmn-infra/requirements.yaml b/kubernetes/so/components/so-bpmn-infra/requirements.yaml
index 9a5ba74..ff6f19d 100755
--- a/kubernetes/so/components/so-bpmn-infra/requirements.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/requirements.yaml
@@ -13,17 +13,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
index 0eaa204..f169946 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: A Helm chart for so-catalog-db-adapter
 name: so-catalog-db-adapter
-version: 7.0.0
\ No newline at end of file
+version: 8.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 9a5ba74..ff6f19d 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml
@@ -13,17 +13,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-cnf-adapter/Chart.yaml b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
index 0211008..b61580a 100755
--- a/kubernetes/so/components/so-cnf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
@@ -16,5 +16,4 @@
 appVersion: "1.7.1"
 description: A Helm chart for Kubernetes
 name: so-cnf-adapter
-version: 7.0.0
-
+version: 8.0.0
diff --git a/kubernetes/so/components/so-cnf-adapter/requirements.yaml b/kubernetes/so/components/so-cnf-adapter/requirements.yaml
index c9af7f9..ce29494 100755
--- a/kubernetes/so/components/so-cnf-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/requirements.yaml
@@ -14,18 +14,17 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
-
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 2db202a..0a086b5 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP SO ETSI NFVO NS LCM
 name: so-etsi-nfvo-ns-lcm
-version: 7.0.0
+version: 8.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 e8367b2..f8b1d74 100755
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml
@@ -13,14 +13,14 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-mariadb/Chart.yaml b/kubernetes/so/components/so-mariadb/Chart.yaml
index e95507b..a39c515 100755
--- a/kubernetes/so/components/so-mariadb/Chart.yaml
+++ b/kubernetes/so/components/so-mariadb/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: MariaDB Service
 name: so-mariadb
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/so/components/so-mariadb/requirements.yaml b/kubernetes/so/components/so-mariadb/requirements.yaml
index 7760cd8..a9e9697 100755
--- a/kubernetes/so/components/so-mariadb/requirements.yaml
+++ b/kubernetes/so/components/so-mariadb/requirements.yaml
@@ -13,14 +13,14 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: readinessCheck
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/so/components/so-monitoring/Chart.yaml b/kubernetes/so/components/so-monitoring/Chart.yaml
index 44a24c3..93e8bcc 100644
--- a/kubernetes/so/components/so-monitoring/Chart.yaml
+++ b/kubernetes/so/components/so-monitoring/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: A Helm chart for ONAP Service Orchestration Monitoring
 name: so-monitoring
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/so/components/so-monitoring/requirements.yaml b/kubernetes/so/components/so-monitoring/requirements.yaml
index 1c45e43..730d75a 100755
--- a/kubernetes/so/components/so-monitoring/requirements.yaml
+++ b/kubernetes/so/components/so-monitoring/requirements.yaml
@@ -14,14 +14,14 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
index 2469dc3..948c8e2 100755
--- a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
@@ -15,4 +15,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-nssmf-adapter
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/so/components/so-nssmf-adapter/requirements.yaml b/kubernetes/so/components/so-nssmf-adapter/requirements.yaml
index 9a5ba74..ff6f19d 100755
--- a/kubernetes/so/components/so-nssmf-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/requirements.yaml
@@ -13,17 +13,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-oof-adapter/Chart.yaml b/kubernetes/so/components/so-oof-adapter/Chart.yaml
index 77e397e..fbdbd3b 100755
--- a/kubernetes/so/components/so-oof-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-oof-adapter/Chart.yaml
@@ -16,4 +16,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-oof-adapter
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/so/components/so-oof-adapter/requirements.yaml b/kubernetes/so/components/so-oof-adapter/requirements.yaml
index cc9892a..12f93f9 100644
--- a/kubernetes/so/components/so-oof-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-oof-adapter/requirements.yaml
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-openstack-adapter/Chart.yaml b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
index aefbe81..88d9cfb 100755
--- a/kubernetes/so/components/so-openstack-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
@@ -15,4 +15,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-openstack-adapter
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/so/components/so-openstack-adapter/requirements.yaml b/kubernetes/so/components/so-openstack-adapter/requirements.yaml
index 9a5ba74..ff6f19d 100755
--- a/kubernetes/so/components/so-openstack-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/requirements.yaml
@@ -13,17 +13,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-request-db-adapter/Chart.yaml b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
index f11df83..0798656 100755
--- a/kubernetes/so/components/so-request-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: A Helm chart for request-db-adapter
 name: so-request-db-adapter
-version: 7.0.0
\ No newline at end of file
+version: 8.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 9a5ba74..ff6f19d 100755
--- a/kubernetes/so/components/so-request-db-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/requirements.yaml
@@ -13,17 +13,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-sdc-controller/Chart.yaml b/kubernetes/so/components/so-sdc-controller/Chart.yaml
index 6d61343..fe17976 100755
--- a/kubernetes/so/components/so-sdc-controller/Chart.yaml
+++ b/kubernetes/so/components/so-sdc-controller/Chart.yaml
@@ -15,4 +15,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-sdc-controller
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/so/components/so-sdc-controller/requirements.yaml b/kubernetes/so/components/so-sdc-controller/requirements.yaml
index 9a5ba74..ff6f19d 100755
--- a/kubernetes/so/components/so-sdc-controller/requirements.yaml
+++ b/kubernetes/so/components/so-sdc-controller/requirements.yaml
@@ -13,17 +13,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
index c8eb365..069a0b0 100755
--- a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
@@ -15,4 +15,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-sdnc-adapter
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/so/components/so-sdnc-adapter/requirements.yaml b/kubernetes/so/components/so-sdnc-adapter/requirements.yaml
index e8367b2..f8b1d74 100755
--- a/kubernetes/so/components/so-sdnc-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/requirements.yaml
@@ -13,14 +13,14 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
index 2957573..fb22321 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP SO VE VNFM Adapter (SOL002)
 name: so-ve-vnfm-adapter
-version: 7.0.0
+version: 8.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 9a5ba74..ff6f19d 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml
@@ -13,17 +13,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-vfc-adapter/Chart.yaml b/kubernetes/so/components/so-vfc-adapter/Chart.yaml
index d8e1dab..520e53d 100755
--- a/kubernetes/so/components/so-vfc-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-vfc-adapter/Chart.yaml
@@ -15,4 +15,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-vfc-adapter
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/so/components/so-vfc-adapter/requirements.yaml b/kubernetes/so/components/so-vfc-adapter/requirements.yaml
index 9a5ba74..ff6f19d 100755
--- a/kubernetes/so/components/so-vfc-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-vfc-adapter/requirements.yaml
@@ -13,17 +13,17 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-vnfm-adapter/Chart.yaml b/kubernetes/so/components/so-vnfm-adapter/Chart.yaml
index 627b4d3..07d56e8 100755
--- a/kubernetes/so/components/so-vnfm-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-vnfm-adapter/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP SO VNFM Adapter
 name: so-vnfm-adapter
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/so/components/so-vnfm-adapter/requirements.yaml b/kubernetes/so/components/so-vnfm-adapter/requirements.yaml
index e8367b2..f8b1d74 100755
--- a/kubernetes/so/components/so-vnfm-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-vnfm-adapter/requirements.yaml
@@ -13,14 +13,14 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/soHelpers/Chart.yaml b/kubernetes/so/components/soHelpers/Chart.yaml
index 5690c31..d3cbc8e 100755
--- a/kubernetes/so/components/soHelpers/Chart.yaml
+++ b/kubernetes/so/components/soHelpers/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: A Helm chart for SO helpers
 name: soHelpers
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/so/components/soHelpers/requirements.yaml b/kubernetes/so/components/soHelpers/requirements.yaml
index c7257e1..eb8b455 100755
--- a/kubernetes/so/components/soHelpers/requirements.yaml
+++ b/kubernetes/so/components/soHelpers/requirements.yaml
@@ -13,11 +13,11 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/so/requirements.yaml b/kubernetes/so/requirements.yaml
index c61f522..3e394b6 100755
--- a/kubernetes/so/requirements.yaml
+++ b/kubernetes/so/requirements.yaml
@@ -13,81 +13,81 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: soHelpers
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/soHelpers'
   - name: so-appc-orchestrator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-appc-orchestrator'
     condition: so-appc-orchestrator.enabled
   - name: so-bpmn-infra
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-bpmn-infra'
   - name: so-catalog-db-adapter
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-catalog-db-adapter'
     condition: so-catalog-db-adapter.enabled
   - name: so-cnf-adapter
-    version: ~7.x-0
+    version: ~8.x-0
     repository: "file://components/so-cnf-adapter"
     condition: so-cnf-adapter.enabled
   - name: so-etsi-nfvo-ns-lcm
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-etsi-nfvo-ns-lcm'
     condition: so-etsi-nfvo-ns-lcm.enabled
   - name: so-mariadb
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-mariadb'
   - name: so-monitoring
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-monitoring'
     condition: so-monitoring.enabled
   - name: so-nssmf-adapter
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-nssmf-adapter'
     condition: so-nssmf-adapter.enabled
   - name: so-oof-adapter
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-oof-adapter'
     condition: so-oof-adapter.enabled
   - name: so-openstack-adapter
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-openstack-adapter'
     condition: so-openstack-adapter.enabled
   - name: so-request-db-adapter
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-request-db-adapter'
   - name: so-sdc-controller
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-sdc-controller'
   - name: so-sdnc-adapter
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-sdnc-adapter'
     condition: so-sdnc-adapter.enabled
   - name: so-ve-vnfm-adapter
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-ve-vnfm-adapter'
     condition: so-ve-vnfm-adapter.enabled
   - name: so-vfc-adapter
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-vfc-adapter'
     condition: so-vfc-adapter.enabled
   - name: so-vnfm-adapter
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/so-vnfm-adapter'
     condition: so-vnfm-adapter.enabled
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml
index 4e56a02..fe69cd4 100644
--- a/kubernetes/uui/Chart.yaml
+++ b/kubernetes/uui/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP uui
 name: uui
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/uui/components/uui-server/Chart.yaml b/kubernetes/uui/components/uui-server/Chart.yaml
index 5b424b6..f98f231 100644
--- a/kubernetes/uui/components/uui-server/Chart.yaml
+++ b/kubernetes/uui/components/uui-server/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP uui server
 name: uui-server
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/uui/requirements.yaml b/kubernetes/uui/requirements.yaml
index 8241eb0..a64f0d3 100644
--- a/kubernetes/uui/requirements.yaml
+++ b/kubernetes/uui/requirements.yaml
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: uui-server
-    version: ~7.x-0
-    repository: 'file://components/uui-server'
\ No newline at end of file
+    version: ~8.x-0
+    repository: 'file://components/uui-server'
diff --git a/kubernetes/vfc/Chart.yaml b/kubernetes/vfc/Chart.yaml
index 0aa0060..443d00e 100644
--- a/kubernetes/vfc/Chart.yaml
+++ b/kubernetes/vfc/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Virtual Function Controller (VF-C)
 name: vfc
-version: 7.0.0
+version: 8.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 6ecd35b..67461bf 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - Generic VNFM Driver
 name: vfc-generic-vnfm-driver
-version: 7.0.0
\ No newline at end of file
+version: 8.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 39a7aa5..bdf33d5 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 a162e7a..690b0c4 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - Huawei VNFM Driver
 name: vfc-huawei-vnfm-driver
-version: 7.0.0
\ No newline at end of file
+version: 8.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 39a7aa5..bdf33d5 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
index bd3bae7..b4fdc3e 100644
--- a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - NS Life Cycle Management
 name: vfc-nslcm
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
index 39a7aa5..bdf33d5 100644
--- a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-redis/Chart.yaml b/kubernetes/vfc/components/vfc-redis/Chart.yaml
index 1655a93..7155cd7 100644
--- a/kubernetes/vfc/components/vfc-redis/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-redis/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - REDIS
 name: vfc-redis
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/vfc/components/vfc-redis/requirements.yaml b/kubernetes/vfc/components/vfc-redis/requirements.yaml
index 39a7aa5..bdf33d5 100644
--- a/kubernetes/vfc/components/vfc-redis/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-redis/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
index ad5cd00..ddc8a63 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - VNF Life Cycle Management
 name: vfc-vnflcm
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
index 39a7aa5..bdf33d5 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
index e56225c..09136b1 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - VNF Manager
 name: vfc-vnfmgr
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
index 39a7aa5..bdf33d5 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
index 5eceede..7799bc5 100644
--- a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - VNF Resource Manager
 name: vfc-vnfres
-version: 7.0.0
\ No newline at end of file
+version: 8.0.0
diff --git a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
index 39a7aa5..bdf33d5 100644
--- a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.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 aff7c02..741fb0c 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - ZTE VNFM Driver
 name: vfc-zte-vnfm-driver
-version: 7.0.0
\ No newline at end of file
+version: 8.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 39a7aa5..bdf33d5 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/vfc/requirements.yaml b/kubernetes/vfc/requirements.yaml
index 962fc90..ab3f4ae 100644
--- a/kubernetes/vfc/requirements.yaml
+++ b/kubernetes/vfc/requirements.yaml
@@ -14,43 +14,43 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: vfc-generic-vnfm-driver
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/vfc-generic-vnfm-driver'
     condition: vfc-generic-vnfm-driver.enabled
   - name: vfc-huawei-vnfm-driver
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/vfc-huawei-vnfm-driver'
     condition: vfc-huawei-vnfm-driver.enabled
   - name: vfc-nslcm
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/vfc-nslcm'
     condition: vfc-nslcm.enabled
   - name: vfc-redis
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/vfc-redis'
     condition: vfc-redis.enabled
   - name: vfc-vnflcm
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/vfc-vnflcm'
     condition: vfc-vnflcm.enabled
   - name: vfc-vnfmgr
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/vfc-vnfmgr'
     condition: vfc-vnfmgr.enabled
   - name: vfc-vnfres
-    version: ~7.x-0
+    version: ~8.x-0
     repository: 'file://components/vfc-vnfres'
     condition: vfc-vnfres.enabled
   - name: vfc-zte-vnfm-driver
-    version: ~7.x-0
+    version: ~8.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 5ad5733..f97c844 100644
--- a/kubernetes/vid/Chart.yaml
+++ b/kubernetes/vid/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Virtual Infrastructure Deployment
 name: vid
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/vid/requirements.yaml b/kubernetes/vid/requirements.yaml
index 34ad968..f26aee0 100644
--- a/kubernetes/vid/requirements.yaml
+++ b/kubernetes/vid/requirements.yaml
@@ -15,22 +15,22 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.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: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
   - name: mariadb-init
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
     condition: not global.mariadbGalera.localCluster
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
diff --git a/kubernetes/vnfsdk/Chart.yaml b/kubernetes/vnfsdk/Chart.yaml
index ae826e8..0b6bfd9 100644
--- a/kubernetes/vnfsdk/Chart.yaml
+++ b/kubernetes/vnfsdk/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VNF SDK
 name: vnfsdk
-version: 7.0.0
+version: 8.0.0
diff --git a/kubernetes/vnfsdk/requirements.yaml b/kubernetes/vnfsdk/requirements.yaml
index 3a4aed7..89ddccd 100644
--- a/kubernetes/vnfsdk/requirements.yaml
+++ b/kubernetes/vnfsdk/requirements.yaml
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: common
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: certInitializer
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: postgres
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'
   - name: repositoryGenerator
-    version: ~7.x-0
+    version: ~8.x-0
     repository: '@local'