diff --git a/INFO.yaml b/INFO.yaml
index 7f7b4f2..33cae2a 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -73,6 +73,11 @@
       company: 'Huawei'
       id: 'xuyang11'
       timezone: 'America/New_York'
+    - name: 'Sylvain Desbureaux'
+      email: 'sylvain.desbureaux@orange.com'
+      company: 'Orange'
+      id: 'sdesbure'
+      timezone: 'Paris/France'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
     changes:
diff --git a/docs/example-integration-override-v3.yaml b/docs/example-integration-override-v3.yaml
new file mode 100644
index 0000000..659389a
--- /dev/null
+++ b/docs/example-integration-override-v3.yaml
@@ -0,0 +1,64 @@
+global:
+  repository: 10.12.5.2:5000
+  pullPolicy: IfNotPresent
+#################################################################
+# This override file configures openstack parameters for ONAP
+#################################################################
+robot:
+  enabled: true
+  flavor: large
+  appcUsername: "appc@appc.onap.org"
+  appcPassword: "demo123456!"
+  # KEYSTONE Version 3  Required for Rocky and beyond
+  openStackKeystoneAPIVersion: "v3"
+  # OS_AUTH_URL without the /v3 from the openstack .RC file
+  openStackKeyStoneUrl: "http://10.12.25.2:5000"
+  # OS_PROJECT_ID from the openstack .RC file
+  openStackTenantId: "09d8566ea45e43aa974cf447ed591d77"
+  # OS_USERNAME from the openstack .RC file
+  openStackUserName: "OS_USERNAME_HERE"
+  #  OS_PROJECT_DOMAIN_ID from the openstack .RC file
+  #  in some environments it is a string but in other environmens it may be a numeric
+  openStackDomainId:  "default"
+  #  OS_USER_DOMAIN_NAME from the openstack .RC file
+  openStackUserDomain:  "Default"
+  openStackProjectName: "OPENSTACK_PROJECT_NAME_HERE"
+  ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+  ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+  openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+  openStackPrivateNetId: "83c84b68-80be-4990-8d7f-0220e3c6e5c8"
+  openStackPrivateSubnetId: "e571c1d1-8ac0-4744-9b40-c3218d0a53a0"
+  openStackPrivateNetCidr: "10.0.0.0/16"
+  openStackOamNetworkCidrPrefix: "10.0"
+  openStackSecurityGroup: "bbe028dc-b64f-4f11-a10f-5c6d8d26dc89"
+  dcaeCollectorIp: "10.12.6.109"
+  vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
+  demoArtifactsVersion: "1.4.0"
+  demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases"
+  scriptVersion: "1.4.0"
+  rancherIpAddress: "10.12.6.160"
+  config:
+    # use the python utility to encrypt the OS_PASSWORD for the OS_USERNAME
+    openStackEncryptedPasswordHere: "XXXXXXXXXXXXXXXXXXXXXXXX_OPENSTACK_PYTHON_PASSWORD_HERE_XXXXXXXXXXXXXXXX"
+    openStackSoEncryptedPassword:  "YYYYYYYYYYYYYYYYYYYYYYYY_OPENSTACK_JAVA_PASSWORD_HERE_YYYYYYYYYYYYYYYY"
+so:
+  enabled: true
+  so-catalog-db-adapter:
+    config:
+      openStackUserName: "OS_USERNAME_HERE"
+      # OS_AUTH_URL (keep the /v3) from the openstack .RC file
+      openStackKeyStoneUrl: "http://10.12.25.2:5000/v3"
+      # use the SO Java utility to encrypt the OS_PASSWORD for the OS_USERNAME
+      openStackEncryptedPasswordHere: "YYYYYYYYYYYYYYYYYYYYYYYY_OPENSTACK_JAVA_PASSWORD_HERE_YYYYYYYYYYYYYYYY"
+appc:
+  enabled: true
+  replicaCount: 3
+  config:
+    enableClustering: true
+    openStackType: "OpenStackProvider"
+    openStackName: "OpenStack"
+    openStackKeyStoneUrl: "http://10.12.25.2:5000/v3"
+    openStackServiceTenantName: "OPENSTACK_PROJECT_NAME_HERE"
+    openStackDomain: "OPEN_STACK_DOMAIN_NAME_HERE"
+    openStackUserName: "OS_USER_NAME_HERE"
+    openStackEncryptedPassword: "OPENSTACK_CLEAR_TEXT_PASSWORD_HERE"
diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index ed71c97..bd5e3ee 100644
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -30,7 +30,7 @@
 OpenStack tenant information.
 
 .. note::
-  Standard and example override files (e.g. onap-all.yaml, openstack.yaml) can be found in 
+  Standard and example override files (e.g. onap-all.yaml, openstack.yaml) can be found in
   the oom/kubernetes/onap/resources/overrides/ directory.
 
 
@@ -77,23 +77,65 @@
 ROBOT uses in Dublin.
 
 .. note::
-  To generate SO openStackEncryptedPasswordHere :
+  To generate SO openStackEncryptedPasswordHere and openStackSoEncryptedPassword:
 
-  SO_ENCRYPTION_KEY=`cat ~/oom/kubenertes/so/resources/config/mso/encrypt.key`
+  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
+
+  [ if javac is not installed 'apt-get update ; apt-get install default-jdk' ]
+
   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_parametes.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 4.** To setup a local Helm server to server up the ONAP charts::
 
   > helm serve &
@@ -129,24 +171,42 @@
   The --timeout 900 is currently required in Dublin to address long running initialization tasks
   for DMaaP and SO. Without this timeout value both applications may fail to deploy.
 
- To deploy all ONAP applications use this command::
+To deploy all ONAP applications use this command::
 
     > cd oom/kubernetes
     > helm deploy dev local/onap --namespace onap -f onap/resources/overrides/onap-all.yaml -f onap/resources/overrides/environment.yaml -f onap/resources/overrides/openstack.yaml --timeout 900
 
- All override files may be customized (or replaced by other overrides) as per needs.
+All override files may be customized (or replaced by other overrides) as per needs.
 
+onap-all.yaml
 
-**Step 9.** Commands to interact with the OOM installation
+  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.
 
-Use the following to monitor your deployment and determine when ONAP is
-ready for use::
+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 9.** 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
 
-Undeploying onap can be done using the following command::
+.. note::
+  While all pods may be in a Running state, it is not a guarantee that all components are running fine.
 
-  > helm undeploy dev --purge
+  Launch the healthcheck tests using Robot to verify that the components are healthy.
 
+  > ~/oom/kubernetes/robot/ete-k8s.sh onap health
+
+**Step 10.** Undeploy ONAP
+
+> helm undeploy dev --purge
 
 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_setup_kubernetes_rancher.rst b/docs/oom_setup_kubernetes_rancher.rst
index 3ccde8d..90a060b 100644
--- a/docs/oom_setup_kubernetes_rancher.rst
+++ b/docs/oom_setup_kubernetes_rancher.rst
@@ -30,19 +30,19 @@
 
 The result at the end of this tutorial will be:
 
-*1.* Creation of a Key Pair to use with Open Stack and RKE
+#. Creation of a Key Pair to use with Open Stack and RKE
 
-*2.* Creation of OpenStack VMs to host Kubernetes Control Plane
+#. Creation of OpenStack VMs to host Kubernetes Control Plane
 
-*3.* Creation of OpenStack VMs to host Kubernetes Workers
+#. Creation of OpenStack VMs to host Kubernetes Workers
 
-*4.* Installation and configuration of RKE to setup an HA Kubernetes
+#. Installation and configuration of RKE to setup an HA Kubernetes
 
-*5.* Installation and configuration of kubectl
+#. Installation and configuration of kubectl
 
-*5.* Installation and configuration of helm
+#. Installation and configuration of helm
 
-*7.* Creation of an NFS Server to be used by ONAP as shared persistance
+#. Creation of an NFS Server to be used by ONAP as shared persistance
 
 There are many ways one can execute the above steps. Including automation through the use of HEAT to setup the OpenStack VMs.
 To better illustrate the steps involved, we have captured the manual creation of such an environment using the ONAP Wind River Open Lab.
@@ -62,7 +62,8 @@
 For the purpose of this guide, we will assume a new local key called "onap-key"
 has been downloaded and is copied into **~/.ssh/**, from which it can be referenced.
 
-Example:
+Example::
+
   > mv onap-key ~/.ssh
 
   > chmod 600 ~/.ssh/onap-key
@@ -250,13 +251,11 @@
 
 Run RKE
 -------
-From within the same directory as the cluster.yml file, simply execute:
+From within the same directory as the cluster.yml file, simply execute::
 
   > rke up
 
-The output will look something like:
-
-.. code-block::
+The output will look something like::
 
   INFO[0000] Initiating Kubernetes cluster
   INFO[0000] [certificates] Generating admin certificates and kubeconfig
@@ -307,6 +306,9 @@
 
 Validate deployment
 -------------------
+
+::
+
   > cp kube_config_cluster.yml ~/.kube/config.onap
 
   > export KUBECONFIG=~/.kube/config.onap
@@ -315,7 +317,7 @@
 
   > kubectl get nodes -o=wide
 
-.. code-block::
+::
 
   NAME             STATUS   ROLES               AGE     VERSION   INTERNAL-IP   EXTERNAL-IP   OS-IMAGE           KERNEL-VERSION      CONTAINER-RUNTIME
   onap-control-1   Ready    controlplane,etcd   3h53m   v1.13.5   10.0.0.8      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
@@ -338,7 +340,8 @@
 Install Helm
 ============
 
-Example Helm client install on Linux:
+Example Helm client install on Linux::
+
   > wget http://storage.googleapis.com/kubernetes-helm/helm-v2.12.3-linux-amd64.tar.gz
 
   > tar -zxvf helm-v2.12.3-linux-amd64.tar.gz
@@ -347,6 +350,9 @@
 
 Initialize Kubernetes Cluster for use by Helm
 ---------------------------------------------
+
+::
+
   > kubectl -n kube-system create serviceaccount tiller
 
   > kubectl create clusterrolebinding tiller --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml
index b7bfb7f..5d0582a 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-cass/Chart.yaml b/kubernetes/aaf/charts/aaf-cass/Chart.yaml
index f06d149..3706810 100644
--- a/kubernetes/aaf/charts/aaf-cass/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-cass/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF cassandra
 name: aaf-cass
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-cm/Chart.yaml b/kubernetes/aaf/charts/aaf-cm/Chart.yaml
index 3ece45d..b284d5b 100644
--- a/kubernetes/aaf/charts/aaf-cm/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-cm/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAF Certificate Manager
 name: aaf-cm
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-fs/Chart.yaml b/kubernetes/aaf/charts/aaf-fs/Chart.yaml
index 5c94aa8..3c0a4d1 100644
--- a/kubernetes/aaf/charts/aaf-fs/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-fs/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF File Server
 name: aaf-fs
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-gui/Chart.yaml b/kubernetes/aaf/charts/aaf-gui/Chart.yaml
index 3313c66..fb41c5f 100644
--- a/kubernetes/aaf/charts/aaf-gui/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-gui/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF GUI
 name: aaf-gui
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-hello/Chart.yaml b/kubernetes/aaf/charts/aaf-hello/Chart.yaml
index 89f061b..0ab6de1 100644
--- a/kubernetes/aaf/charts/aaf-hello/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF Hello
 name: aaf-hello
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-locate/Chart.yaml b/kubernetes/aaf/charts/aaf-locate/Chart.yaml
index 10c2b3e..c7f5fc3 100644
--- a/kubernetes/aaf/charts/aaf-locate/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF Locate
 name: aaf-locate
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-oauth/Chart.yaml b/kubernetes/aaf/charts/aaf-oauth/Chart.yaml
index 4ce29df..c073652 100644
--- a/kubernetes/aaf/charts/aaf-oauth/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-oauth/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF OAuth
 name: aaf-oauth
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/aaf/charts/aaf-service/Chart.yaml b/kubernetes/aaf/charts/aaf-service/Chart.yaml
index 80b2b8f..a5a38f4 100644
--- a/kubernetes/aaf/charts/aaf-service/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-service/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP AAF Service
 name: aaf-service
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sms/Chart.yaml b/kubernetes/aaf/charts/aaf-sms/Chart.yaml
index 9402b00..0cb82cb 100644
--- a/kubernetes/aaf/charts/aaf-sms/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Secret Management Service
 name: aaf-sms
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml
index 88079d2..876f358 100644
--- a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Secret Management Service Quorum Client
 name: aaf-sms-quorumclient
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml
index 2c8a7a6..1c3a1af 100644
--- a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/charts/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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml
index 04e9a5a..de6130c 100644
--- a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml
@@ -28,7 +28,7 @@
   - name: {{ .Values.service.portName }}
     {{if eq .Values.service.type "NodePort" -}}
     port: {{ .Values.service.internalPort }}
-    nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }}
+    nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
     {{- else -}}
     port: {{ .Values.service.externalPort }}
     targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/service.yaml b/kubernetes/aaf/charts/aaf-sms/templates/service.yaml
index 18334a3..5e6bffb 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/service.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/templates/service.yaml
@@ -28,7 +28,7 @@
   - name: {{ .Values.service.PortName }}
     {{if eq .Values.service.type "NodePort" -}}
     port: {{ .Values.service.internalPort }}
-    nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }}
+    nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
     {{- else -}}
     port: {{ .Values.service.externalPort }}
     targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/aaf/charts/aaf-sshsm/Chart.yaml b/kubernetes/aaf/charts/aaf-sshsm/Chart.yaml
index 6ad7e7f..5b9b3e5 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Hardware Security Components
 name: aaf-sshsm
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml
index ce74887..3a9b9cd 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Trusted Platform Module Resource Manager
 name: aaf-sshsm-abrmd
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml
index 14ddd7b..50ee07c 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Trusted Platform Module Distribution Center
 name: aaf-sshsm-distcenter
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml
index 6260cdd..bc0f559 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Trusted Platform Module Test CA Service
 name: aaf-sshsm-testca
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/aaf/charts/aaf-sshsm/requirements.yaml b/kubernetes/aaf/charts/aaf-sshsm/requirements.yaml
index 7c18fbc..e6ac00b 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/requirements.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/aaf/requirements.yaml b/kubernetes/aaf/requirements.yaml
index 1d30dfd..1063d17 100644
--- a/kubernetes/aaf/requirements.yaml
+++ b/kubernetes/aaf/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/aai b/kubernetes/aai
index 6509a17..c2d6e68 160000
--- a/kubernetes/aai
+++ b/kubernetes/aai
@@ -1 +1 @@
-Subproject commit 6509a172751b3c85995100e3d3a205abe73b116c
+Subproject commit c2d6e68b32be2bc2a421f21d23b12abdf314198c
diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml
index b7a0755..fdda8bb 100644
--- a/kubernetes/appc/Chart.yaml
+++ b/kubernetes/appc/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Application Controller
 name: appc
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/appc/charts/appc-ansible-server/Chart.yaml b/kubernetes/appc/charts/appc-ansible-server/Chart.yaml
index de5213f..c1ffaef 100644
--- a/kubernetes/appc/charts/appc-ansible-server/Chart.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP APPC Ansible Server
 name: appc-ansible-server
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/appc/charts/appc-ansible-server/requirements.yaml b/kubernetes/appc/charts/appc-ansible-server/requirements.yaml
index 3944441..dedaefb 100644
--- a/kubernetes/appc/charts/appc-ansible-server/requirements.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/appc/charts/appc-ansible-server/templates/pv.yaml b/kubernetes/appc/charts/appc-ansible-server/templates/pv.yaml
index 25257ea..6fef70c 100644
--- a/kubernetes/appc/charts/appc-ansible-server/templates/pv.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/templates/pv.yaml
@@ -19,7 +19,7 @@
 kind: PersistentVolume
 apiVersion: v1
 metadata:
-  name: {{ include "common.fullname" $global }}-data{{$i}}
+  name: {{ include "common.fullname" $global }}-playbook{{$i}}
   namespace: {{ include "common.namespace" $global }}
   labels:
     app: {{ include "common.fullname" $global }}
@@ -32,7 +32,7 @@
     storage: {{ $global.Values.persistence.size}}
   accessModes:
     - {{ $global.Values.persistence.accessMode }}
-  storageClassName: "{{ include "common.fullname" $global }}-data"
+  storageClassName: "{{ include "common.fullname" $global }}-playbook"
   persistentVolumeReclaimPolicy: {{ $global.Values.persistence.volumeReclaimPolicy }}
   hostPath:
     path: {{ $global.Values.global.persistence.mountPath | default $global.Values.persistence.mountPath }}/{{ $global.Release.Name }}/{{ $global.Values.persistence.mountSubPath }}{{$i}}
diff --git a/kubernetes/appc/charts/appc-ansible-server/templates/statefulset.yaml b/kubernetes/appc/charts/appc-ansible-server/templates/statefulset.yaml
index 1df20c2..f7fa15c 100644
--- a/kubernetes/appc/charts/appc-ansible-server/templates/statefulset.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/templates/statefulset.yaml
@@ -30,6 +30,13 @@
         app: {{ include "common.name" . }}
         release: {{ .Release.Name }}
     spec:
+      initContainers:
+      - name: {{ include "common.name" . }}-chown
+        image: "busybox"
+        command: ["sh", "-c", "chown -R {{ .Values.config.ansibleUid }}:{{ .Values.config.ansibleGid}} {{ .Values.persistence.playbookPath }}"]
+        volumeMounts:
+          - mountPath: {{ .Values.persistence.playbookPath }}
+            name: {{ include "common.fullname" . }}-playbook
       containers:
         - name: {{ include "common.name" . }}
           command: ["/bin/bash"]
@@ -60,7 +67,7 @@
             name: config
             subPath: RestServer_config
           - mountPath: {{ .Values.persistence.playbookPath }}
-            name: {{ include "common.fullname" . }}-data
+            name: {{ include "common.fullname" . }}-playbook
           resources:
 {{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
@@ -80,20 +87,18 @@
             name: {{ include "common.fullname" . }}
             defaultMode: 0644
 {{ if not .Values.persistence.enabled }}
-        - name: {{ include "common.fullname" . }}-data
+        - name: {{ include "common.fullname" . }}-playbook
           emptyDir: {}
 {{ else }}
   volumeClaimTemplates:
   - metadata:
-      name: {{ include "common.fullname" . }}-data
+      name: {{ include "common.fullname" . }}-playbook
       labels:
         name: {{ include "common.fullname" . }}
     spec:
       accessModes: [ {{ .Values.persistence.accessMode }} ]
-      storageClassName: {{ include "common.fullname" . }}-data
+      storageClassName: {{ include "common.fullname" . }}-playbook
       resources:
         requests:
           storage: {{ .Values.persistence.size }}
 {{ end }}
-    imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/appc/charts/appc-ansible-server/values.yaml b/kubernetes/appc/charts/appc-ansible-server/values.yaml
index 59cf29f..f2dd150 100644
--- a/kubernetes/appc/charts/appc-ansible-server/values.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/values.yaml
@@ -37,6 +37,8 @@
 
 # application configuration
 config:
+  ansibleUid: 100
+  ansibleGid: 101
   appcChartName: appc
   mysqlServiceName: appc-dbhost
   configDir: /opt/onap/ccsdk
@@ -89,7 +91,7 @@
   size: 1Gi
   mountPath: /dockerdata-nfs
   mountSubPath: appc/ansible
-  playbookPath: /var/local
+  playbookPath: /home/ansible
 
 ingress:
   enabled: false
diff --git a/kubernetes/appc/charts/appc-cdt/Chart.yaml b/kubernetes/appc/charts/appc-cdt/Chart.yaml
index 7680f7f..8bbbbd4 100644
--- a/kubernetes/appc/charts/appc-cdt/Chart.yaml
+++ b/kubernetes/appc/charts/appc-cdt/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP APPC Self Service Controller Design Tool
 name: appc-cdt
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/appc/charts/appc-cdt/requirements.yaml b/kubernetes/appc/charts/appc-cdt/requirements.yaml
index fae2fe2..ad039c2 100644
--- a/kubernetes/appc/charts/appc-cdt/requirements.yaml
+++ b/kubernetes/appc/charts/appc-cdt/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml
index 7db9527..95034d3 100644
--- a/kubernetes/appc/charts/appc-cdt/values.yaml
+++ b/kubernetes/appc/charts/appc-cdt/values.yaml
@@ -26,7 +26,7 @@
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/appc-cdt-image:1.5.3
+image: onap/appc-cdt-image:1.6.0-SNAPSHOT-latest
 pullPolicy: Always
 
 # application configuration
diff --git a/kubernetes/appc/requirements.yaml b/kubernetes/appc/requirements.yaml
index e48d857..43eeee3 100644
--- a/kubernetes/appc/requirements.yaml
+++ b/kubernetes/appc/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: dgbuilder
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh
deleted file mode 100755
index 724f4e7..0000000
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# APPC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-###
-
-ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
-APPC_HOME=${APPC_HOME:-/opt/onap/appc}
-ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
-APPC_FEATURE_DIR=${APPC_FEATURE_DIR:-${APPC_HOME}/features}
-
-function featureInstall {
-COUNT=0
-while [ $COUNT -lt 10 ]; do
-  ${ODL_HOME}/bin/client feature:install $1 2> /tmp/installErr
-  cat /tmp/installErr
-  if grep -q 'Failed to get the session' /tmp/installErr; then
-    sleep 10
-  else
-    let COUNT=10
-  fi
-  let COUNT=COUNT+1
-done
-}
-
- APPC_FEATURES=" \
- appc-metric \
- appc-dmaap-adapter \
- appc-chef-adapter \
- appc-netconf-adapter \
- appc-rest-adapter \
- appc-lifecycle-management \
- appc-dispatcher \
- appc-provider \
- appc-dg-util \
- appc-dg-shared \
- appc-sdc-listener \
- appc-oam \
- appc-iaas-adapter \
- appc-ansible-adapter \
- appc-sequence-generator \
- appc-artifact-handler \
- appc-aai-client"
-
-APPC_FEATURES_1=" \
- onap-appc-core \
- onap-appc-metric \
- onap-appc-dmaap-adapter \
- onap-appc-chef-adapter \
- onap-appc-netconf-adapter \
- onap-appc-rest-adapter \
- onap-appc-lifecycle-management \
- onap-appc-license-manager"
-
- APPC_FEATURES_2=" \
- onap-appc-dg-util \
- onap-appc-dg-shared \
- onap-appc-sdc-listener \
- onap-appc-oam \
- onap-appc-iaas-adapter \
- onap-appc-ansible-adapter \
- onap-appc-sequence-generator \
- onap-appc-config-generator \
- onap-appc-config-data-services \
- onap-appc-config-adaptor \
- onap-appc-config-audit \
- onap-appc-config-encryption-tool \
- onap-appc-config-flow-controller \
- onap-appc-config-params \
- onap-appc-artifact-handler
- onap-appc-aai-client \
- onap-appc-event-listener \
- onap-appc-network-inventory-client \
- onap-appc-design-services \
- onap-appc-interfaces-service"
-
- APPC_FEATURES_UNZIP=" \
- appc-core \
- appc-metric \
- appc-dmaap-adapter \
- appc-event-listener \
- appc-chef-adapter \
- appc-netconf-adapter \
- appc-rest-adapter \
- appc-lifecycle-management \
- appc-dispatcher \
- appc-provider \
- appc-dg-util \
- appc-dg-shared \
- appc-sdc-listener \
- appc-oam \
- appc-iaas-adapter \
- appc-ansible-adapter \
- appc-sequence-generator \
- appc-config-generator \
- appc-config-data-services \
- appc-config-adaptor \
- appc-config-audit \
- appc-config-encryption-tool \
- appc-config-flow-controller \
- appc-config-params \
- appc-artifact-handler \
- appc-aai-client \
- appc-network-inventory-client \
- appc-design-services \
- appc-interfaces-service"
-
-
-if $ENABLE_ODL_CLUSTER
-  then
-    echo "Enabling core APP-C features with clustering enabled"
-    featureInstall odl-netconf-connector-all
-    featureInstall odl-restconf-noauth
-    featureInstall odl-netconf-clustered-topology
-  else
-    echo "Enabling core APP-C features with clustering disabled"
-    featureInstall odl-netconf-connector-all
-    featureInstall odl-restconf-noauth
-    featureInstall odl-netconf-topology
-fi
-
-sleep 7s
-echo "Installing APP-C Features"
-echo ""
-
-for feature in ${APPC_FEATURES_UNZIP}
-do
-  if [ -f ${APPC_FEATURE_DIR}/${feature}/install-feature.sh ]
-  then
-    ${APPC_FEATURE_DIR}/${feature}/install-feature.sh
-  else
-    echo "No installer found for feature ${feature}"
-  fi
-done
-
-#${ODL_HOME}/bin/client feature:install appc-metric appc-dmaap-adapter appc-event-listener appc-chef-adapter appc-netconf-adapter appc-rest-adapter appc-lifecycle-management appc-dispatcher appc-provider appc-dg-util appc-dg-shared appc-sdc-listener appc-oam appc-iaas-adapter appc-ansible-adapter appc-sequence-generator appc-config-generator appc-config-data-services appc-config-adaptor appc-config-audit appc-config-encryption-tool appc-config-flow-controller appc-config-params appc-artifact-handler appc-aai-client
-
-for feature in ${APPC_FEATURES_1}
-do
-  echo "Installing ${feature}"
-  start=$(date +%s)
-  ${ODL_HOME}/bin/client "feature:install -r ${feature}"
-  end=$(date +%s)
-  echo "Install of ${feature} took $(expr $end - $start) seconds"
-  sleep 7s
-  echo "Sleep Finished"
-done
-
-  echo "Installing dispatcher features"
-  start=$(date +%s)
-  ${ODL_HOME}/bin/client "feature:install -r onap-appc-request-handler onap-appc-command-executor onap-appc-lifecycle-management onap-appc-workflow-management lock-manager onap-appc-provider"
-  end=$(date +%s)
-  echo "Install of dispatcher features took $(expr $end - $start) seconds"
-  sleep 7s
-  echo "Sleep Finished"
-
-for feature in ${APPC_FEATURES_2}
-do
-  echo "Installing ${feature}"
-  start=$(date +%s)
-  ${ODL_HOME}/bin/client "feature:install -r ${feature}"
-  end=$(date +%s)
-  echo "Install of ${feature} took $(expr $end - $start) seconds"
-  sleep 7s
-  echo "Sleep Finished"
-done
-
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
index ed35de8..ad135f8 100755
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
+++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
@@ -132,8 +132,7 @@
 
         if $ENABLE_ODL_CLUSTER
         then
-                echo "Installing Opendaylight cluster features"
-                ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering
+                echo "Enabling Opendaylight cluster features"
                 enable_odl_cluster
         fi
 
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/startODL.sh
deleted file mode 100755
index 231fd0a..0000000
--- a/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/startODL.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# openECOMP : SDN-C
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights
-#                                                       reserved.
-# Modifications Copyright © 2018 Amdocs,Bell Canada
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-
-# Install SDN-C platform components if not already installed and start container
-
-ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
-ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
-SLEEP_TIME=${SLEEP_TIME:-120}
-MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.mariadbRootPassword}}}
-
-#
-# Wait for database
-#
-echo "Waiting for mariadbgalera"
-until mysql -h {{.Values.config.mariadbGaleraSVCName}}.{{.Release.Namespace}} -u root -p{{.Values.config.mariadbRootPassword}} mysql &> /dev/null
-do
-  printf "."
-  sleep 1
-done
-echo -e "\nmariadbgalera ready"
-
-if [ ! -f ${SDNC_HOME}/.installed ]
-then
-        echo "Installing SDN-C database"
-        ${SDNC_HOME}/bin/installSdncDb.sh
-        echo "Starting OpenDaylight"
-        ${ODL_HOME}/bin/start
-        echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
-        sleep ${SLEEP_TIME}
-        echo "Installing SDN-C platform features"
-        ${SDNC_HOME}/bin/installFeatures.sh
-        if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
-        then
-                echo "Installing directed graphs"
-                ${SDNC_HOME}/svclogic/bin/install.sh
-        fi
-
-
-        echo "Restarting OpenDaylight"
-        ${ODL_HOME}/bin/stop
-        echo "Installed at `date`" > ${SDNC_HOME}/.installed
-fi
-
-exec ${ODL_HOME}/bin/karaf
-
diff --git a/kubernetes/appc/templates/service.yaml b/kubernetes/appc/templates/service.yaml
index 32938cc..fdd31a4 100644
--- a/kubernetes/appc/templates/service.yaml
+++ b/kubernetes/appc/templates/service.yaml
@@ -41,7 +41,7 @@
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-      name: "{{ .Values.service.portName }}-8282"
+      name: "{{ .Values.service.portName }}-8443"
     - port: {{ .Values.service.externalPort2 }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
       name: "{{ .Values.service.portName }}-1830"
@@ -52,7 +52,7 @@
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.portName }}-8282
+      name: {{ .Values.service.portName }}-8443
     - port: {{ .Values.service.externalPort2 }}
       targetPort: {{ .Values.service.internalPort2 }}
       name: {{ .Values.service.portName }}-1830
diff --git a/kubernetes/appc/templates/statefulset.yaml b/kubernetes/appc/templates/statefulset.yaml
index 6677516..4fded9a 100644
--- a/kubernetes/appc/templates/statefulset.yaml
+++ b/kubernetes/appc/templates/statefulset.yaml
@@ -32,10 +32,9 @@
         app: {{ include "common.name" . }}
         release: {{ .Release.Name }}
     spec:
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
       initContainers:
-      - command:
+      - name: {{ include "common.name" . }}-readiness
+        command:
         - /root/ready.py
         args:
         - --container-name
@@ -48,7 +47,12 @@
               fieldPath: metadata.namespace
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: {{ include "common.name" . }}-readiness
+      - name: {{ include "common.name" . }}-chown
+        image: "busybox"
+        command: ["sh", "-c", "chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.persistence.mdsalPath }}"]
+        volumeMounts:
+          - mountPath: {{ .Values.persistence.mdsalPath }}
+            name: {{ include "common.fullname" . }}-data
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -116,9 +120,6 @@
           - mountPath: /opt/onap/appc/bin/installAppcDb.sh
             name: onap-appc-bin
             subPath: installAppcDb.sh
-          - mountPath: /opt/onap/appc/bin/installFeatures.sh
-            name: onap-appc-bin
-            subPath: installFeatures.sh
           - mountPath: /opt/onap/appc/bin/health_check.sh
             name: onap-appc-bin
             subPath: health_check.sh
@@ -137,9 +138,6 @@
           - mountPath: /opt/onap/ccsdk/svclogic/bin/showActiveGraphs.sh
             name: onap-sdnc-svclogic-bin
             subPath: showActiveGraphs.sh
-          - mountPath: /opt/onap/ccsdk/bin/startODL.sh
-            name: onap-sdnc-bin
-            subPath: startODL.sh
           - mountPath: /opt/onap/ccsdk/bin/installSdncDb.sh
             name: onap-sdnc-bin
             subPath: installSdncDb.sh
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index a19b67d..937642b 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -31,7 +31,7 @@
 flavor: small
 # application image
 repository: nexus3.onap.org:10001
-image: onap/appc-image:1.5.3
+image: onap/appc-image:1.6.0-SNAPSHOT-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -39,6 +39,8 @@
 
 # application configuration
 config:
+  odlUid: 100
+  odlGid: 101
   ansibleServiceName: appc-ansible-server
   ansiblePort: 8000
   mariadbRootPassword: secretpassword
@@ -118,9 +120,9 @@
   name: appc
   portName: appc
   #targetPort
-  internalPort: 8181
+  internalPort: 8443
   #port
-  externalPort: 8282
+  externalPort: 8443
   nodePort: 30
 
   externalPort2: 1830
diff --git a/kubernetes/cds/Chart.yaml b/kubernetes/cds/Chart.yaml
index acf35d4..f96054f 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/Chart.yaml b/kubernetes/cds/charts/cds-blueprints-processor/Chart.yaml
index 0563675..2bd381e 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/Chart.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP CDS Blueprints Processor
 name: cds-blueprints-processor
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/requirements.yaml b/kubernetes/cds/charts/cds-blueprints-processor/requirements.yaml
index 9f92507..e2f56f5 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/requirements.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml b/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
index 736b5ce..95069fc 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
@@ -60,7 +60,7 @@
           {{ if .Values.liveness.enabled }}
           livenessProbe:
             httpGet:
-              path: /api/v1/execution-service/ping
+              path: /api/v1/execution-service/health-check
               port: {{ .Values.service.http.internalPort }}
               httpHeaders:
               - name: Authorization
@@ -70,7 +70,7 @@
           {{ end }}
           readinessProbe:
             httpGet:
-              path: /api/v1/execution-service/ping
+              path: /api/v1/execution-service/health-check
               port: {{ .Values.service.http.internalPort }}
               httpHeaders:
               - name: Authorization
diff --git a/kubernetes/cds/charts/cds-command-executor/Chart.yaml b/kubernetes/cds/charts/cds-command-executor/Chart.yaml
index 6f17c88..3b6bb99 100755
--- a/kubernetes/cds/charts/cds-command-executor/Chart.yaml
+++ b/kubernetes/cds/charts/cds-command-executor/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP CDS Command Executor
 name: cds-command-executor
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-command-executor/requirements.yaml b/kubernetes/cds/charts/cds-command-executor/requirements.yaml
index a57d2b6..d7301b6 100755
--- a/kubernetes/cds/charts/cds-command-executor/requirements.yaml
+++ b/kubernetes/cds/charts/cds-command-executor/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-controller-blueprints/Chart.yaml b/kubernetes/cds/charts/cds-controller-blueprints/Chart.yaml
index fa04a16..45776ca 100644
--- a/kubernetes/cds/charts/cds-controller-blueprints/Chart.yaml
+++ b/kubernetes/cds/charts/cds-controller-blueprints/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP CDS Controller Blueprints
 name: cds-controller-blueprints
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-controller-blueprints/requirements.yaml b/kubernetes/cds/charts/cds-controller-blueprints/requirements.yaml
index 857a963..35b3420 100644
--- a/kubernetes/cds/charts/cds-controller-blueprints/requirements.yaml
+++ b/kubernetes/cds/charts/cds-controller-blueprints/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml b/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml
index 4385de1..e00a959 100755
--- a/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP CDS SDC listener microservice
 name: cds-sdc-listener
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml b/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml
index a57d2b6..d7301b6 100755
--- a/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-ui/Chart.yaml b/kubernetes/cds/charts/cds-ui/Chart.yaml
index d168e7c..3eb310a 100644
--- a/kubernetes/cds/charts/cds-ui/Chart.yaml
+++ b/kubernetes/cds/charts/cds-ui/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP CDS UI
 name: cds-ui
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-ui/requirements.yaml b/kubernetes/cds/charts/cds-ui/requirements.yaml
index a57d2b6..d7301b6 100644
--- a/kubernetes/cds/charts/cds-ui/requirements.yaml
+++ b/kubernetes/cds/charts/cds-ui/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
index ead1b2e..562cd54 100644
--- a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
@@ -50,14 +50,22 @@
           env:
             - name: HOST
               value: 0.0.0.0
-            - name: API_BLUEPRINT_CONTROLLER_BASE_URL
-              value: {{ .Values.config.api.controller.baseUrl }}
-            - name: API_BLUEPRINT_CONTROLLER_AUTH_TOKEN
-              value: {{ .Values.config.api.controller.authToken }}
-            - name: API_BLUEPRINT_PROCESSOR_BASE_URL
-              value: {{ .Values.config.api.processor.baseUrl }}
-            - name: API_BLUEPRINT_PROCESSOR_AUTH_TOKEN
-              value: {{ .Values.config.api.processor.authToken }}
+            - name: APP_ACTION_DEPLOY_BLUEPRINT_GRPC_ENABLED
+              value: "{{ .Values.config.app.action.deployBlueprint.grpcEnabled }}"
+            - name: API_BLUEPRINT_CONTROLLER_HTTP_BASE_URL
+              value: {{ .Values.config.api.controller.http.baseUrl }}
+            - name: API_BLUEPRINT_CONTROLLER_HTTP_AUTH_TOKEN
+              value: {{ .Values.config.api.controller.http.authToken }}
+            - name: API_BLUEPRINT_PROCESSOR_HHTP_BASE_URL
+              value: {{ .Values.config.api.processor.http.baseUrl }}
+            - name: API_BLUEPRINT_PROCESSOR_HTTP_AUTH_TOKEN
+              value: {{ .Values.config.api.processor.http.authToken }}
+            - name: API_BLUEPRINT_PROCESSOR_GRPC_HOST
+              value: {{ .Values.config.api.processor.grpc.host }}
+            - name: API_BLUEPRINT_PROCESSOR_GRPC_PORT
+              value: "{{ .Values.config.api.processor.grpc.port }}"
+            - name: API_BLUEPRINT_PROCESSOR_GRPC_AUTH_TOKEN
+              value: {{ .Values.config.api.processor.grpc.authToken }}
           readinessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort }}
diff --git a/kubernetes/cds/charts/cds-ui/values.yaml b/kubernetes/cds/charts/cds-ui/values.yaml
index 036b888..1ba8a17 100644
--- a/kubernetes/cds/charts/cds-ui/values.yaml
+++ b/kubernetes/cds/charts/cds-ui/values.yaml
@@ -33,13 +33,23 @@
 
 # application configuration
 config:
+  app:
+    action:
+      deployBlueprint:
+        grpcEnabled: true
   api:
     controller:
-      baseUrl: http://cds-controller-blueprints:8080/api/v1
-      authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+      http:
+       baseUrl: http://cds-controller-blueprints:8080/api/v1
+       authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
     processor:
-      baseUrl: http://cds-blueprints-processor-http:8080/api/v1
-      authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+      http:
+       baseUrl: http://cds-blueprints-processor-http:8080/api/v1
+       authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+      grpc:
+        host: cds-blueprints-processor-grpc
+        port: 9111
+        authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
 
 # default number of instances
 replicaCount: 1
diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml
index 51a4e3f..d6975c4 100644
--- a/kubernetes/cds/requirements.yaml
+++ b/kubernetes/cds/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/clamp/Chart.yaml b/kubernetes/clamp/Chart.yaml
index dc04da7..54f2df1 100644
--- a/kubernetes/clamp/Chart.yaml
+++ b/kubernetes/clamp/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Clamp
 name: clamp
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-es/Chart.yaml b/kubernetes/clamp/charts/clamp-dash-es/Chart.yaml
index 23367ab..c43b7f3 100644
--- a/kubernetes/clamp/charts/clamp-dash-es/Chart.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-es/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Clamp Dashboard Elasticsearch
 name: clamp-dash-es
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-es/requirements.yaml b/kubernetes/clamp/charts/clamp-dash-es/requirements.yaml
index 0ba9e47..57ee781 100644
--- a/kubernetes/clamp/charts/clamp-dash-es/requirements.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-es/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/Chart.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/Chart.yaml
index 0a00ba0..954eebc 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/Chart.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Clamp Dashboard Kibana
 name: clamp-dash-kibana
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/requirements.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/requirements.yaml
index 0ba9e47..57ee781 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/requirements.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/Chart.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/Chart.yaml
index 4c7c84d..4960a70 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/Chart.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Clamp Dashboard Logstash
 name: clamp-dash-logstash
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/requirements.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/requirements.yaml
index 0ba9e47..57ee781 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/requirements.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/clamp/charts/mariadb/Chart.yaml b/kubernetes/clamp/charts/mariadb/Chart.yaml
index 7418361..ef12d23 100644
--- a/kubernetes/clamp/charts/mariadb/Chart.yaml
+++ b/kubernetes/clamp/charts/mariadb/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: MariaDB Service
 name: mariadb
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/clamp/requirements.yaml b/kubernetes/clamp/requirements.yaml
index 68a7d9e..05d49a8 100644
--- a/kubernetes/clamp/requirements.yaml
+++ b/kubernetes/clamp/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/cli/Chart.yaml b/kubernetes/cli/Chart.yaml
index d3a1927..8c1f491 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/cli/requirements.yaml b/kubernetes/cli/requirements.yaml
index 9996777..6a748be 100644
--- a/kubernetes/cli/requirements.yaml
+++ b/kubernetes/cli/requirements.yaml
@@ -14,7 +14,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml
index 25cfebf..29688cd 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/cassandra/requirements.yaml b/kubernetes/common/cassandra/requirements.yaml
index 645b41b..8c1b197 100644
--- a/kubernetes/common/cassandra/requirements.yaml
+++ b/kubernetes/common/cassandra/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index 201b0d5..f4cca48 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml
index edcd2e9..2063cb3 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: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/common/dgbuilder/requirements.yaml b/kubernetes/common/dgbuilder/requirements.yaml
index 4a81e88..3ec7ed7 100644
--- a/kubernetes/common/dgbuilder/requirements.yaml
+++ b/kubernetes/common/dgbuilder/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml
index 31a8ad5..a01524c 100644
--- a/kubernetes/common/etcd/Chart.yaml
+++ b/kubernetes/common/etcd/Chart.yaml
@@ -14,7 +14,7 @@
  
 name: etcd
 home: https://github.com/coreos/etcd
-version: 4.0.0
+version: 5.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 0ddbcbe..29a3835 100644
--- a/kubernetes/common/etcd/requirements.yaml
+++ b/kubernetes/common/etcd/requirements.yaml
@@ -14,5 +14,5 @@
 # limitations under the License
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml
index 64ba32d..1688e0e 100644
--- a/kubernetes/common/mariadb-galera/Chart.yaml
+++ b/kubernetes/common/mariadb-galera/Chart.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 description: Chart for MariaDB Galera cluster
 name: mariadb-galera
-version: 4.0.0
+version: 5.0.0
 keywords:
   - mariadb
   - mysql
diff --git a/kubernetes/common/mariadb-galera/requirements.yaml b/kubernetes/common/mariadb-galera/requirements.yaml
index f01f533..d323dda 100644
--- a/kubernetes/common/mariadb-galera/requirements.yaml
+++ b/kubernetes/common/mariadb-galera/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: 'file://../common'
\ No newline at end of file
diff --git a/kubernetes/common/mongo/Chart.yaml b/kubernetes/common/mongo/Chart.yaml
index 98c9cf8..f08a53b 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/mongo/requirements.yaml b/kubernetes/common/mongo/requirements.yaml
index 71fbbc5..79d7de4 100644
--- a/kubernetes/common/mongo/requirements.yaml
+++ b/kubernetes/common/mongo/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/common/music/Chart.yaml b/kubernetes/common/music/Chart.yaml
index 3b08fb0..db8962c 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml b/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml
index 1cf5470..0a8cf35 100644
--- a/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml
+++ b/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml
@@ -15,5 +15,5 @@
 apiVersion: v1
 description: Cassandra Job - Run CQL Scripts after Cassandra Starts.
 name: music-cassandra-job
-version: 4.0.0
+version: 5.0.0
 
diff --git a/kubernetes/common/music/charts/music-cassandra/Chart.yaml b/kubernetes/common/music/charts/music-cassandra/Chart.yaml
index da15d33..b94527f 100644
--- a/kubernetes/common/music/charts/music-cassandra/Chart.yaml
+++ b/kubernetes/common/music/charts/music-cassandra/Chart.yaml
@@ -15,5 +15,5 @@
 apiVersion: v1
 description: ONAP - Cassandra Database
 name: music-cassandra
-version: 4.0.0
+version: 5.0.0
 
diff --git a/kubernetes/common/music/charts/music-cassandra/requirements.yaml b/kubernetes/common/music/charts/music-cassandra/requirements.yaml
index cee64a5..7619223 100644
--- a/kubernetes/common/music/charts/music-cassandra/requirements.yaml
+++ b/kubernetes/common/music/charts/music-cassandra/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/common/music/charts/music-tomcat/Chart.yaml b/kubernetes/common/music/charts/music-tomcat/Chart.yaml
index ef9e966..207f9dc 100755
--- a/kubernetes/common/music/charts/music-tomcat/Chart.yaml
+++ b/kubernetes/common/music/charts/music-tomcat/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP - MUSIC Tomcat Container
 name: music-tomcat
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/music/charts/music-tomcat/requirements.yaml b/kubernetes/common/music/charts/music-tomcat/requirements.yaml
index 8b30624..a3dabc0 100755
--- a/kubernetes/common/music/charts/music-tomcat/requirements.yaml
+++ b/kubernetes/common/music/charts/music-tomcat/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/common/music/requirements.yaml b/kubernetes/common/music/requirements.yaml
index fae2fe2..ad039c2 100644
--- a/kubernetes/common/music/requirements.yaml
+++ b/kubernetes/common/music/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/common/mysql/Chart.yaml b/kubernetes/common/mysql/Chart.yaml
index 1ff737d..7f27229 100644
--- a/kubernetes/common/mysql/Chart.yaml
+++ b/kubernetes/common/mysql/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: MySQL Server
 name: mysql
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/mysql/requirements.yaml b/kubernetes/common/mysql/requirements.yaml
index 71fbbc5..79d7de4 100644
--- a/kubernetes/common/mysql/requirements.yaml
+++ b/kubernetes/common/mysql/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml
index 4b7690b..4ba7de9 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml
index 31fe2fd..9ef8db8 100644
--- a/kubernetes/common/network-name-gen/requirements.yaml
+++ b/kubernetes/common/network-name-gen/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~4.x-0
+    version: ~5.x-0
     repository: file://../mariadb-galera/
diff --git a/kubernetes/common/nfs-provisioner/Chart.yaml b/kubernetes/common/nfs-provisioner/Chart.yaml
index fcb69b3..ad16ed7 100644
--- a/kubernetes/common/nfs-provisioner/Chart.yaml
+++ b/kubernetes/common/nfs-provisioner/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: NFS provisioner
 name: nfs-provisioner
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/nfs-provisioner/requirements.yaml b/kubernetes/common/nfs-provisioner/requirements.yaml
index d175386..542c262 100644
--- a/kubernetes/common/nfs-provisioner/requirements.yaml
+++ b/kubernetes/common/nfs-provisioner/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml
index 2de3b42..b16a55a 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/postgres/charts/pgpool/Chart.yaml b/kubernetes/common/postgres/charts/pgpool/Chart.yaml
index 7807d5b..e281813 100644
--- a/kubernetes/common/postgres/charts/pgpool/Chart.yaml
+++ b/kubernetes/common/postgres/charts/pgpool/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Postgres Server
 name: pgpool
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/common/postgres/charts/pgpool/requirements.yaml b/kubernetes/common/postgres/charts/pgpool/requirements.yaml
index 27f4c40..5b097f3 100644
--- a/kubernetes/common/postgres/charts/pgpool/requirements.yaml
+++ b/kubernetes/common/postgres/charts/pgpool/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/common/postgres/requirements.yaml b/kubernetes/common/postgres/requirements.yaml
index 27f4c40..5b097f3 100644
--- a/kubernetes/common/postgres/requirements.yaml
+++ b/kubernetes/common/postgres/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/consul/Chart.yaml b/kubernetes/consul/Chart.yaml
index 1bbeea9..33b1891 100644
--- a/kubernetes/consul/Chart.yaml
+++ b/kubernetes/consul/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Consul Agent
 name: consul
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/consul/charts/consul-server/Chart.yaml b/kubernetes/consul/charts/consul-server/Chart.yaml
index f8244f0..c80364a 100644
--- a/kubernetes/consul/charts/consul-server/Chart.yaml
+++ b/kubernetes/consul/charts/consul-server/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Consul Server
 name: consul-server
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/consul/charts/consul-server/requirements.yaml b/kubernetes/consul/charts/consul-server/requirements.yaml
index 68a7d9e..05d49a8 100644
--- a/kubernetes/consul/charts/consul-server/requirements.yaml
+++ b/kubernetes/consul/charts/consul-server/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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 68a7d9e..05d49a8 100644
--- a/kubernetes/consul/requirements.yaml
+++ b/kubernetes/consul/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/contrib/Chart.yaml b/kubernetes/contrib/Chart.yaml
index 634b692..703e2bc 100755
--- a/kubernetes/contrib/Chart.yaml
+++ b/kubernetes/contrib/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP optional tools
 name: contrib
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/contrib/charts/netbox/Chart.yaml b/kubernetes/contrib/charts/netbox/Chart.yaml
index db2c984..86b41aa 100755
--- a/kubernetes/contrib/charts/netbox/Chart.yaml
+++ b/kubernetes/contrib/charts/netbox/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Netbox IPAM
 name: netbox
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml
index c23cb20..cfd2a3a 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Netbox - Application (WSGI + Gunicorn)
 name: netbox-app
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml
index 11acec1..783edc1 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Netbox - Nginx web server
 name: netbox-nginx
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml
index 7490bf0..17468c4 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Netbox Posgres database
 name: netbox-postgres
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/contrib/charts/netbox/requirements.yaml b/kubernetes/contrib/charts/netbox/requirements.yaml
index 5d82013..ab55e20 100755
--- a/kubernetes/contrib/charts/netbox/requirements.yaml
+++ b/kubernetes/contrib/charts/netbox/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/contrib/requirements.yaml b/kubernetes/contrib/requirements.yaml
index 5d82013..ab55e20 100644
--- a/kubernetes/contrib/requirements.yaml
+++ b/kubernetes/contrib/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index ceda39b..9c23194 100644
--- a/kubernetes/dcaegen2/Chart.yaml
+++ b/kubernetes/dcaegen2/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP DCAE Gen2
 name: dcaegen2
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml
index 6ac53de..b92c943 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE Bootstrap
 name: dcae-bootstrap
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml
index 5807f08..4b650c0 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/requirements.yaml
@@ -18,8 +18,8 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: postgres
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml
index 1f84269..159e2b5 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE Cloudify Manager
 name: dcae-cloudify-manager
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml
index 0ba9e47..57ee781 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml
index 295abdb..f1aa82b 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE Config Binding Service
 name: dcae-config-binding-service
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml
index 0ba9e47..57ee781 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml
index 35d892a..042eb68 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-deployment-handler/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE Deployment Handler
 name: dcae-deployment-handler
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml
index d2b64d3..2dabd19 100644
--- a/kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-deployment-handler/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.0.0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml
index 56e49c9..c6db31d 100644
--- a/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-healthcheck/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP DCAE Health Check
 name: dcae-healthcheck
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml
index 5b4519e..500ab3c 100644
--- a/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-healthcheck/requirements.yaml
@@ -18,5 +18,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml
index 98844dc..d2b275b 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-policy-handler/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE Policy Handler
 name: dcae-policy-handler
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml
index d2b64d3..2dabd19 100644
--- a/kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-policy-handler/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.0.0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml
index f01b628..49ae5d2 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP DCAE Redis
 name: dcae-redis
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml
index f6b1545..c0e6595 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml
index 918f82e..64c8910 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE Service Change Handler
 name: dcae-servicechange-handler
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml
index 1b6e852..e1735ec 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: ONAP DCAE Inventory API Service
 name: dcae-inventory-api
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml
index 55ac839..9136278 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: postgres
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml
index 0ba9e47..57ee781 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/dcaegen2/requirements.yaml b/kubernetes/dcaegen2/requirements.yaml
index fae2fe2..ad039c2 100644
--- a/kubernetes/dcaegen2/requirements.yaml
+++ b/kubernetes/dcaegen2/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml
index 810e863..669b9a0 100644
--- a/kubernetes/dmaap/Chart.yaml
+++ b/kubernetes/dmaap/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP DMaaP components
 name: dmaap
-version: 4.0.1
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
index 37862dc..05389d3 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
index ff249ee..66da1c5 100644
--- a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
@@ -14,9 +14,9 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: postgres
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: PG.enabled
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
index 44bf9df..eac85ac 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
index 0b61906..3b3cf9a 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
@@ -20,5 +20,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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 fd9a51a..4457ee5 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
index 949b5bb..8af1edb 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
@@ -20,9 +20,9 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: mariadb-galera
     alias: mariadb
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/dmaap/components/message-router/Chart.yaml b/kubernetes/dmaap/components/message-router/Chart.yaml
index 1a05378..87ae24e 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-kafka/Chart.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-kafka/Chart.yaml
index 0f7c277..83f619d 100644
--- a/kubernetes/dmaap/components/message-router/charts/message-router-kafka/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-kafka/Chart.yaml
@@ -16,5 +16,5 @@
 apiVersion: v1
 description: ONAP Message Router Kafka Service
 name: message-router-kafka
-version: 4.0.0
+version: 5.0.0
 
diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/Chart.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/Chart.yaml
index 1d0b7be..921865d 100644
--- a/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/Chart.yaml
@@ -16,5 +16,5 @@
 apiVersion: v1
 description: ONAP Message Router Kafka Service
 name: message-router-mirrormaker
-version: 4.0.0
+version: 5.0.0
 
diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/Chart.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/Chart.yaml
index a6a73b5..61246f5 100644
--- a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/Chart.yaml
@@ -16,5 +16,5 @@
 apiVersion: v1
 description: ONAP Dmaap Message Router Zookeeper Service
 name: message-router-zookeeper
-version: 4.0.0
+version: 5.0.0
 
diff --git a/kubernetes/dmaap/components/message-router/requirements.yaml b/kubernetes/dmaap/components/message-router/requirements.yaml
index a13c53d..6d98d68 100644
--- a/kubernetes/dmaap/components/message-router/requirements.yaml
+++ b/kubernetes/dmaap/components/message-router/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/dmaap/requirements.yaml b/kubernetes/dmaap/requirements.yaml
index 3507bd8..50ff259 100644
--- a/kubernetes/dmaap/requirements.yaml
+++ b/kubernetes/dmaap/requirements.yaml
@@ -15,21 +15,21 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: message-router
-    version: ~4.x-0
+    version: ~5.x-0
     repository: 'file://components/message-router'
     condition: message-router.enabled
   - name: dmaap-bc
-    version: ~4.x-0
+    version: ~5.x-0
     repository: 'file://components/dmaap-bc'
     condition: dmaap-bc.enabled
   - name: dmaap-dr-node
-    version: ~4.x-0
+    version: ~5.x-0
     repository: 'file://components/dmaap-dr-node'
     condition: dmaap-dr-node.enabled
   - name: dmaap-dr-prov
-    version: ~4.x-0
+    version: ~5.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 0f48961..79436f7 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/esr/charts/esr-gui/Chart.yaml b/kubernetes/esr/charts/esr-gui/Chart.yaml
index dfc1e26..d603877 100644
--- a/kubernetes/esr/charts/esr-gui/Chart.yaml
+++ b/kubernetes/esr/charts/esr-gui/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP External System Register GUI
 name: esr-gui
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/esr/charts/esr-server/Chart.yaml b/kubernetes/esr/charts/esr-server/Chart.yaml
index c9718f2..66fcffc 100644
--- a/kubernetes/esr/charts/esr-server/Chart.yaml
+++ b/kubernetes/esr/charts/esr-server/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP External System Register GUI
 name: esr-server
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/esr/charts/esr-server/requirements.yaml b/kubernetes/esr/charts/esr-server/requirements.yaml
index 9ebc9b9..bcc64d8 100644
--- a/kubernetes/esr/charts/esr-server/requirements.yaml
+++ b/kubernetes/esr/charts/esr-server/requirements.yaml
@@ -14,7 +14,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/esr/requirements.yaml b/kubernetes/esr/requirements.yaml
index 68a7d9e..05d49a8 100644
--- a/kubernetes/esr/requirements.yaml
+++ b/kubernetes/esr/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/helm/starters/onap-app/Chart.yaml b/kubernetes/helm/starters/onap-app/Chart.yaml
index b3472d4..efb130f 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: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/helm/starters/onap-app/requirements.yaml b/kubernetes/helm/starters/onap-app/requirements.yaml
index 1d30dfd..1063d17 100644
--- a/kubernetes/helm/starters/onap-app/requirements.yaml
+++ b/kubernetes/helm/starters/onap-app/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/log/Chart.yaml b/kubernetes/log/Chart.yaml
index 09edd37..b0a75cb 100644
--- a/kubernetes/log/Chart.yaml
+++ b/kubernetes/log/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Logging ElasticStack
 name: log
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/log/charts/log-elasticsearch/Chart.yaml b/kubernetes/log/charts/log-elasticsearch/Chart.yaml
index b5275eb..484a8e3 100644
--- a/kubernetes/log/charts/log-elasticsearch/Chart.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Logging Elasticsearch
 name: log-elasticsearch
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/log/charts/log-elasticsearch/requirements.yaml b/kubernetes/log/charts/log-elasticsearch/requirements.yaml
index 0ba9e47..57ee781 100644
--- a/kubernetes/log/charts/log-elasticsearch/requirements.yaml
+++ b/kubernetes/log/charts/log-elasticsearch/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/log/charts/log-kibana/Chart.yaml b/kubernetes/log/charts/log-kibana/Chart.yaml
index 2038476..0e85c91 100644
--- a/kubernetes/log/charts/log-kibana/Chart.yaml
+++ b/kubernetes/log/charts/log-kibana/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Logging Kibana
 name: log-kibana
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/log/charts/log-kibana/requirements.yaml b/kubernetes/log/charts/log-kibana/requirements.yaml
index 0ba9e47..57ee781 100644
--- a/kubernetes/log/charts/log-kibana/requirements.yaml
+++ b/kubernetes/log/charts/log-kibana/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/log/charts/log-kibana/resources/config/README.txt b/kubernetes/log/charts/log-kibana/resources/config/README.txt
new file mode 100644
index 0000000..2863c1d
--- /dev/null
+++ b/kubernetes/log/charts/log-kibana/resources/config/README.txt
@@ -0,0 +1 @@
+"kibana-onboarding.json" file contains initial setup of Kibana obtained using Elasticdump tool.
\ No newline at end of file
diff --git a/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json b/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json
diff --git a/kubernetes/log/charts/log-kibana/templates/deployment.yaml b/kubernetes/log/charts/log-kibana/templates/deployment.yaml
index ac52f62..657dca4 100644
--- a/kubernetes/log/charts/log-kibana/templates/deployment.yaml
+++ b/kubernetes/log/charts/log-kibana/templates/deployment.yaml
@@ -46,6 +46,22 @@
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
+      - args:
+        - --input=/config/kibana-onboarding.json
+        - --output=http://{{.Values.config.elasticsearchServiceName}}.{{ include "common.namespace" . }}:{{.Values.config.elasticsearchPort}}/.kibana
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: "{{ .Values.elasticdumpRepository }}/{{ .Values.elasticdumpImage }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        name: {{ include "common.name" . }}-elasticdump
+        volumeMounts:
+          - mountPath: /config/kibana-onboarding.json
+            name: {{ include "common.fullname" . }}
+            subPath: kibana-onboarding.json
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}"
@@ -90,5 +106,7 @@
             items:
             - key: kibana.yml
               path: kibana.yml
+            - key: kibana-onboarding.json
+              path: kibana-onboarding.json
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/log/charts/log-kibana/values.yaml b/kubernetes/log/charts/log-kibana/values.yaml
index 8a56151..5132768 100644
--- a/kubernetes/log/charts/log-kibana/values.yaml
+++ b/kubernetes/log/charts/log-kibana/values.yaml
@@ -26,6 +26,10 @@
 # Application configuration defaults.
 #################################################################
 
+# Elasticdump image
+elasticdumpRepository: docker.io
+elasticdumpImage: taskrabbit/elasticsearch-dump
+
 # BusyBox image
 busyboxRepository: registry.hub.docker.com
 busyboxImage: library/busybox:latest
diff --git a/kubernetes/log/charts/log-logstash/Chart.yaml b/kubernetes/log/charts/log-logstash/Chart.yaml
index 51bf878..398a322 100644
--- a/kubernetes/log/charts/log-logstash/Chart.yaml
+++ b/kubernetes/log/charts/log-logstash/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Logging Logstash
 name: log-logstash
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/log/charts/log-logstash/requirements.yaml b/kubernetes/log/charts/log-logstash/requirements.yaml
index 0ba9e47..57ee781 100644
--- a/kubernetes/log/charts/log-logstash/requirements.yaml
+++ b/kubernetes/log/charts/log-logstash/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/log/requirements.yaml b/kubernetes/log/requirements.yaml
index fae2fe2..ad039c2 100644
--- a/kubernetes/log/requirements.yaml
+++ b/kubernetes/log/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/modeling/Chart.yaml b/kubernetes/modeling/Chart.yaml
index 5094318..526cef7 100644
--- a/kubernetes/modeling/Chart.yaml
+++ b/kubernetes/modeling/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Modeling (Modeling)
 name: modeling
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml b/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml
index 48c0c64..d5f20be 100644
--- a/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml
+++ b/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Modeling - Genericparser
 name: modeling-genericparser
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/modeling/requirements.yaml b/kubernetes/modeling/requirements.yaml
index 71bfc00..c2c445c 100644
--- a/kubernetes/modeling/requirements.yaml
+++ b/kubernetes/modeling/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/msb/Chart.yaml b/kubernetes/msb/Chart.yaml
index a0714aa..ddd8ba4 100644
--- a/kubernetes/msb/Chart.yaml
+++ b/kubernetes/msb/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus
 name: msb
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/kube2msb/Chart.yaml b/kubernetes/msb/charts/kube2msb/Chart.yaml
index 3290f4d..e0dc244 100644
--- a/kubernetes/msb/charts/kube2msb/Chart.yaml
+++ b/kubernetes/msb/charts/kube2msb/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Kube2MSB Registrator
 name: kube2msb
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/kube2msb/requirements.yaml b/kubernetes/msb/charts/kube2msb/requirements.yaml
index 2d2a9f0..798f2d3 100644
--- a/kubernetes/msb/charts/kube2msb/requirements.yaml
+++ b/kubernetes/msb/charts/kube2msb/requirements.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/msb/charts/msb-consul/Chart.yaml b/kubernetes/msb/charts/msb-consul/Chart.yaml
index ce0088e..ccb6e3d 100644
--- a/kubernetes/msb/charts/msb-consul/Chart.yaml
+++ b/kubernetes/msb/charts/msb-consul/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Consul
 name: msb-consul
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/msb-consul/requirements.yaml b/kubernetes/msb/charts/msb-consul/requirements.yaml
index 2d2a9f0..798f2d3 100644
--- a/kubernetes/msb/charts/msb-consul/requirements.yaml
+++ b/kubernetes/msb/charts/msb-consul/requirements.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/msb/charts/msb-discovery/Chart.yaml b/kubernetes/msb/charts/msb-discovery/Chart.yaml
index 88e0aa6..7e1b554 100644
--- a/kubernetes/msb/charts/msb-discovery/Chart.yaml
+++ b/kubernetes/msb/charts/msb-discovery/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Discovery
 name: msb-discovery
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/msb-discovery/requirements.yaml b/kubernetes/msb/charts/msb-discovery/requirements.yaml
index 2d2a9f0..798f2d3 100644
--- a/kubernetes/msb/charts/msb-discovery/requirements.yaml
+++ b/kubernetes/msb/charts/msb-discovery/requirements.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/msb/charts/msb-eag/Chart.yaml b/kubernetes/msb/charts/msb-eag/Chart.yaml
index c9f7c90..5360093 100644
--- a/kubernetes/msb/charts/msb-eag/Chart.yaml
+++ b/kubernetes/msb/charts/msb-eag/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Internal API Gateway
 name: msb-eag
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/msb-eag/requirements.yaml b/kubernetes/msb/charts/msb-eag/requirements.yaml
index 2d2a9f0..798f2d3 100644
--- a/kubernetes/msb/charts/msb-eag/requirements.yaml
+++ b/kubernetes/msb/charts/msb-eag/requirements.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/msb/charts/msb-iag/Chart.yaml b/kubernetes/msb/charts/msb-iag/Chart.yaml
index 870d951..549a199 100644
--- a/kubernetes/msb/charts/msb-iag/Chart.yaml
+++ b/kubernetes/msb/charts/msb-iag/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP MicroServices Bus Internal API Gateway
 name: msb-iag
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/msb/charts/msb-iag/requirements.yaml b/kubernetes/msb/charts/msb-iag/requirements.yaml
index 2d2a9f0..798f2d3 100644
--- a/kubernetes/msb/charts/msb-iag/requirements.yaml
+++ b/kubernetes/msb/charts/msb-iag/requirements.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/msb/requirements.yaml b/kubernetes/msb/requirements.yaml
index 2d2a9f0..798f2d3 100644
--- a/kubernetes/msb/requirements.yaml
+++ b/kubernetes/msb/requirements.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index 9b90b2b..0c7b001 100644
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud broker
 name: multicloud
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-azure/Chart.yaml b/kubernetes/multicloud/charts/multicloud-azure/Chart.yaml
index 825eaf6..b6221b3 100644
--- a/kubernetes/multicloud/charts/multicloud-azure/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-azure/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud Azure plugin
 name: multicloud-azure
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml b/kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml
index ac5e817..5ceb5b1 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack fcaps Plugin
 name: multicloud-fcaps
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml b/kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml
index 5a73ee3..3c61d81 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Multicloud Kubernetes Plugin
 name: multicloud-k8s
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml b/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml
index 7754685..fa1c397 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml
+++ b/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml
@@ -14,14 +14,14 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: etcd
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml b/kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml
index 702bafe..fc682be 100644
--- a/kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-lenovo/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack Lenovo Plugin
 name: multicloud-lenovo
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml b/kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml
index ba8b70a..85be015 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack Ocata Plugin
 name: multicloud-ocata
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-pike/Chart.yaml b/kubernetes/multicloud/charts/multicloud-pike/Chart.yaml
index 6c71dea..f936566 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-pike/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack Pike Plugin
 name: multicloud-pike
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml
index 6e54b93..5eaffa7 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Multicloud Prometheus
 name: multicloud-prometheus
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml
index 6dae8ef..0020823 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Multicloud Prometheus Alert Manager
 name: prometheus-alertmanager
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml
index 77970b8..6c3f8a4 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Multicloud Grafana for Prometheus
 name: prometheus-grafana
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml b/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml
index ae7dba6..70250e9 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud VIO plugin
 name: multicloud-vio
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml b/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml
index fa0ea64..46c5dfb 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP multicloud OpenStack WindRiver Plugin
 name: multicloud-windriver
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/multicloud/requirements.yaml b/kubernetes/multicloud/requirements.yaml
index 0ba9e47..57ee781 100644
--- a/kubernetes/multicloud/requirements.yaml
+++ b/kubernetes/multicloud/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/nbi/Chart.yaml b/kubernetes/nbi/Chart.yaml
index 76b668e..f82bf47 100644
--- a/kubernetes/nbi/Chart.yaml
+++ b/kubernetes/nbi/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Northbound Interface
 name: nbi
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/nbi/charts/mariadb/Chart.yaml b/kubernetes/nbi/charts/mariadb/Chart.yaml
index 96b11ea..06ac100 100644
--- a/kubernetes/nbi/charts/mariadb/Chart.yaml
+++ b/kubernetes/nbi/charts/mariadb/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP NBI MariaDB Service
 name: mariadb
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/nbi/charts/mariadb/requirements.yaml b/kubernetes/nbi/charts/mariadb/requirements.yaml
index ce3bc46..56097c0 100644
--- a/kubernetes/nbi/charts/mariadb/requirements.yaml
+++ b/kubernetes/nbi/charts/mariadb/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/nbi/requirements.yaml b/kubernetes/nbi/requirements.yaml
index d9dd0bc..b440b1e 100644
--- a/kubernetes/nbi/requirements.yaml
+++ b/kubernetes/nbi/requirements.yaml
@@ -15,12 +15,12 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
 
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 82228a8..fa2ed65 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -14,10 +14,10 @@
 
 apiVersion: v1
 name: onap
-version: 4.0.0
-appVersion: Dublin
+version: 5.0.0
+appVersion: El Alto 
 description: Open Network Automation Platform (ONAP)
 home: https://www.onap.org/
 sources:
 - https://gerrit.onap.org/r/#/admin/projects/
-icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2
\ No newline at end of file
+icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
old mode 100644
new mode 100755
index c267eaa..5dd51a0
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -18,133 +18,137 @@
 # > helm repo add local http://127.0.0.1:8879
 dependencies:
   - name: aaf
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: aaf.enabled
   - name: aai
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: aai.enabled
   - name: appc
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: appc.enabled
   - name: cassandra
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: cassandra.enabled
   - name: clamp
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: clamp.enabled
   - name: cli
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: cli.enabled
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: consul
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: consul.enabled
   - name: contrib
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: contrib.enabled
   - name: dcaegen2
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: dcaegen2.enabled
   - name: dmaap
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: dmaap.enabled
   - name: esr
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: esr.enabled
   - name: log
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: log.enabled
   - name: sniro-emulator
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: sniro-emulator.enabled
   - name: mariadb-galera
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: mariadb-galera.enabled
   - name: msb
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: msb.enabled
   - name: multicloud
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: multicloud.enabled
   - name: nbi
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: nbi.enabled
   - name: nfs-provisioner
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: nfs-provisioner.enabled
   - name: pnda
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: pnda.enabled
   - name: policy
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: policy.enabled
   - name: pomba
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: pomba.enabled
   - name: portal
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: portal.enabled
   - name: oof
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: oof.enabled
   - name: robot
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: robot.enabled
   - name: sdc
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: sdc.enabled
   - name: sdnc
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: sdnc.enabled
   - name: so
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: so.enabled
   - name: uui
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: uui.enabled
   - name: vfc
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: vfc.enabled
   - name: vid
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: vid.enabled
   - name: vnfsdk
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: vnfsdk.enabled
   - name: modeling
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: modeling.enabled
+  - name: nginx-ingress
+    version: ~1.6.18
+    repository: 'https://kubernetes-charts.storage.googleapis.com'
+    condition: nginx-ingress.enabled
diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
new file mode 100644
index 0000000..75ce8e5
--- /dev/null
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -0,0 +1,225 @@
+# Copyright © 2017,2019 Amdocs, AT&T , Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#################################################################
+#
+# These overrides will affect all helm charts (ie. applications)
+# that are listed below and are 'enabled'.
+#
+#
+# This is specifically for the environments which take time to
+# deploy ONAP. This increase in timeouts prevents false restarting of
+# the pods during startup configuration.
+#
+# These timers have been tuned by the ONAP integration team. They
+# have been tested and validated in the ONAP integration lab (Intel/Windriver lab).
+# They are however indicative and may be adapted to your environment as they
+# depend on the performance of the infrastructure you are installing ONAP on.
+#
+# Please note that these timers must remain reasonable, in other words, if
+# your infrastructure is not performant enough, extending the timers to very
+# large value may not fix all installation issues on over subscribed hardware.
+#
+#################################################################
+aaf:
+  aaf-cs:
+    liveness:
+      initialDelaySeconds: 240
+    readiness:
+      initialDelaySeconds: 240
+  aaf-gui:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+  aaf-oauth:
+    liveness:
+      initialDelaySeconds: 300
+    readiness:
+      initialDelaySeconds: 300
+  aaf-service:
+    liveness:
+      initialDelaySeconds: 300
+    readiness:
+      initialDelaySeconds: 300
+aai:
+  liveness:
+    initialDelaySeconds: 120
+  aai-champ:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+  aai-data-router:
+    liveness:
+      initialDelaySeconds: 120
+  aai-sparky-be:
+    liveness:
+      initialDelaySeconds: 120
+  aai-spike:
+    liveness:
+      initialDelaySeconds: 120
+  aai-cassandra:
+    liveness:
+      periodSeconds: 120
+    readiness:
+      periodSeconds: 60
+appc:
+  mariadb-galera:
+    liveness:
+      initialDelaySeconds: 180
+      periodSeconds: 60
+cassandra:
+  liveness:
+    initialDelaySeconds: 120
+    periodSeconds: 120
+  readiness:
+    initialDelaySeconds: 120
+    periodSeconds: 60
+clamp:
+  liveness:
+    initialDelaySeconds: 60
+  readiness:
+    initialDelaySeconds: 60
+dcaegen2:
+  dcae-cloudify-manager:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+dmaap:
+  dmaap-bus-controller:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+  message-router:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+  dmaap-dr-prov:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+    mariadb:
+      liveness:
+        initialDelaySeconds: 180
+        periodSeconds: 60
+  dmaap-dr-node:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+mariadb-galera:
+  liveness:
+    initialDelaySeconds: 180
+    periodSeconds: 60
+  mariadb-galera-server:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+modeling:
+  mariadb-galera:
+    liveness:
+      initialDelaySeconds: 180
+      periodSeconds: 60
+oof:
+  oof-has:
+    music:
+      music-cassandra:
+        liveness:
+          periodSeconds: 120
+        readiness:
+          periodSeconds: 60
+portal:
+  portal-app:
+    liveness:
+      initialDelaySeconds: 60
+    readiness:
+      initialDelaySeconds: 60
+  portal-cassandra:
+    liveness:
+      periodSeconds: 120
+    readiness:
+      periodSeconds: 60
+sdc:
+  sdc-be:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+  sdc-cs:
+    liveness:
+      initialDelaySeconds: 120
+      periodSeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+      periodSeconds: 60
+  sdc-es:
+    liveness:
+      initialDelaySeconds: 60
+    readiness:
+      initialDelaySeconds: 120
+  sdc-onboarding-be:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+sdnc:
+  liveness:
+    initialDelaySeconds: 60
+  readiness:
+    initialDelaySeconds: 60
+  dmaap-listener:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+  mariadb-galera:
+    liveness:
+      initialDelaySeconds: 180
+      periodSeconds: 60
+  sdnc-ansible-server:
+    readiness:
+      initialDelaySeconds: 120
+  sdnc-portal:
+    readiness:
+      initialDelaySeconds: 120
+  ueb-listener:
+    liveness:
+      initialDelaySeconds: 60
+    readiness:
+      initialDelaySeconds: 60
+so:
+  liveness:
+    initialDelaySeconds: 120
+  mariadb:
+    liveness:
+      initialDelaySeconds: 900
+    readiness:
+      initialDelaySeconds: 900
+uui:
+  uui-server:
+    liveness:
+      initialDelaySeconds: 120
+    readiness:
+      initialDelaySeconds: 120
+vfc:
+  mariadb-galera:
+    liveness:
+      initialDelaySeconds: 180
+      periodSeconds: 60
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
new file mode 100644
index 0000000..ee27269
--- /dev/null
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
@@ -0,0 +1,80 @@
+# Copyright © 2019 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+###################################################################
+# This override file enables helm charts for all ONAP applications.
+###################################################################
+cassandra:
+  enabled: true
+mariadb-galera:
+  enabled: true
+
+aaf:
+  enabled: true
+aai:
+  enabled: true
+appc:
+  enabled: true
+clamp:
+  enabled: true
+cli:
+  enabled: true
+consul:
+  enabled: true
+contrib:
+  enabled: true
+dcaegen2:
+  enabled: true
+dmaap:
+  enabled: true
+esr:
+  enabled: true
+log:
+  enabled: true
+sniro-emulator:
+  enabled: true
+oof:
+  enabled: true
+msb:
+  enabled: true
+multicloud:
+  enabled: true
+nbi:
+  enabled: true
+policy:
+  enabled: true
+pomba:
+  enabled: true
+portal:
+  enabled: true
+robot:
+  enabled: true
+sdc:
+  enabled: true
+sdnc:
+  enabled: true
+so:
+  enabled: true
+uui:
+  enabled: true
+vfc:
+  enabled: true
+vid:
+  enabled: true
+  ingress:
+      enabled: true
+vnfsdk:
+  enabled: true
+nginx-ingress:
+    enabled: true
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 1716415..04fbc97 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -74,3 +74,5 @@
   enabled: true
 vnfsdk:
   enabled: true
+modeling:
+  enabled: true
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
old mode 100644
new mode 100755
index c009504..46c8db6
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -168,3 +168,5 @@
   enabled: false
 modeling:
   enabled: false
+nginx-ingress:
+  enabled: false
diff --git a/kubernetes/oof/Chart.yaml b/kubernetes/oof/Chart.yaml
index a623d59..09b363c 100755
--- a/kubernetes/oof/Chart.yaml
+++ b/kubernetes/oof/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Optimization Framework
 name: oof
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/Chart.yaml b/kubernetes/oof/charts/oof-cmso/Chart.yaml
index 253f350..65e225a 100644
--- a/kubernetes/oof/charts/oof-cmso/Chart.yaml
+++ b/kubernetes/oof/charts/oof-cmso/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: Chart for Change Management Service Orchestrator (CMSO)
 name: oof-cmso
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/Chart.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/Chart.yaml
index 78fedfd..db69108 100644
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-optimizer/Chart.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/Chart.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/Chart.yaml
index 2cfc9e7..97cfe27 100644
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/Chart.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/Chart.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/Chart.yaml
index e99b3be..7c726b9 100644
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-ticketmgt/Chart.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/Chart.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/Chart.yaml
index 258d9ee..361c4cb 100644
--- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-topology/Chart.yaml
+++ b/kubernetes/oof/charts/oof-cmso/charts/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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-cmso/requirements.yaml b/kubernetes/oof/charts/oof-cmso/requirements.yaml
index a1b9f7a..16c438f 100644
--- a/kubernetes/oof/charts/oof-cmso/requirements.yaml
+++ b/kubernetes/oof/charts/oof-cmso/requirements.yaml
@@ -14,11 +14,11 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/oof/charts/oof-has/Chart.yaml b/kubernetes/oof/charts/oof-has/Chart.yaml
index 4000b12..4b50543 100755
--- a/kubernetes/oof/charts/oof-has/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Service
 name: oof-has
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-api/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-api/Chart.yaml
index ad76980..666b750 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-api/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-api/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Servicei - API
 name: oof-has-api
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/Chart.yaml
index 64f13ed..9690161 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Sservice - Controller
 name: oof-has-controller
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-data/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-data/Chart.yaml
index 21e82c7..d47b40a 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-data/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-data/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Service - Data Component
 name: oof-has-data
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/Chart.yaml
index e6594a4..ee1b9cb 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Sevice - Reservation Component
 name: oof-has-reservation
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/Chart.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/Chart.yaml
index f4a594b..7afd9e8 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/Chart.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Homing and Allocation Service - Solver Component
 name: oof-has-solver
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/oof/charts/oof-has/requirements.yaml b/kubernetes/oof/charts/oof-has/requirements.yaml
index ca6d2b1..0acd1ef 100755
--- a/kubernetes/oof/charts/oof-has/requirements.yaml
+++ b/kubernetes/oof/charts/oof-has/requirements.yaml
@@ -15,8 +15,8 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: music
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/oof/requirements.yaml b/kubernetes/oof/requirements.yaml
index f8b0466..38538de 100755
--- a/kubernetes/oof/requirements.yaml
+++ b/kubernetes/oof/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/pnda/Chart.yaml b/kubernetes/pnda/Chart.yaml
index 5a66181..6f95f40 100644
--- a/kubernetes/pnda/Chart.yaml
+++ b/kubernetes/pnda/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP DCAE PNDA
 name: pnda
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pnda/charts/dcae-pnda-bootstrap/Chart.yaml b/kubernetes/pnda/charts/dcae-pnda-bootstrap/Chart.yaml
index 0286bd7..226b9e0 100644
--- a/kubernetes/pnda/charts/dcae-pnda-bootstrap/Chart.yaml
+++ b/kubernetes/pnda/charts/dcae-pnda-bootstrap/Chart.yaml
@@ -17,4 +17,4 @@
 apiVersion: v1
 description: ONAP DCAE PNDA Bootstrap
 name: dcae-pnda-bootstrap
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pnda/charts/dcae-pnda-bootstrap/requirements.yaml b/kubernetes/pnda/charts/dcae-pnda-bootstrap/requirements.yaml
index d195f83..dc0355b 100644
--- a/kubernetes/pnda/charts/dcae-pnda-bootstrap/requirements.yaml
+++ b/kubernetes/pnda/charts/dcae-pnda-bootstrap/requirements.yaml
@@ -16,5 +16,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/pnda/charts/dcae-pnda-mirror/Chart.yaml b/kubernetes/pnda/charts/dcae-pnda-mirror/Chart.yaml
index 94754f7..15ac85d 100644
--- a/kubernetes/pnda/charts/dcae-pnda-mirror/Chart.yaml
+++ b/kubernetes/pnda/charts/dcae-pnda-mirror/Chart.yaml
@@ -17,4 +17,4 @@
 apiVersion: v1
 description: ONAP DCAE PNDA Mirror
 name: dcae-pnda-mirror
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pnda/charts/dcae-pnda-mirror/requirements.yaml b/kubernetes/pnda/charts/dcae-pnda-mirror/requirements.yaml
index d195f83..dc0355b 100644
--- a/kubernetes/pnda/charts/dcae-pnda-mirror/requirements.yaml
+++ b/kubernetes/pnda/charts/dcae-pnda-mirror/requirements.yaml
@@ -16,5 +16,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/pnda/requirements.yaml b/kubernetes/pnda/requirements.yaml
index d195f83..dc0355b 100644
--- a/kubernetes/pnda/requirements.yaml
+++ b/kubernetes/pnda/requirements.yaml
@@ -16,5 +16,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
index e56e4fa..9dc7c28 100644
--- a/kubernetes/policy/Chart.yaml
+++ b/kubernetes/policy/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Policy Administration Point
 name: policy
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/brmsgw/Chart.yaml b/kubernetes/policy/charts/brmsgw/Chart.yaml
index 01bff49..2538be9 100644
--- a/kubernetes/policy/charts/brmsgw/Chart.yaml
+++ b/kubernetes/policy/charts/brmsgw/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Policy BRMS GW
 name: brmsgw
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/brmsgw/requirements.yaml b/kubernetes/policy/charts/brmsgw/requirements.yaml
index 68a7d9e..05d49a8 100644
--- a/kubernetes/policy/charts/brmsgw/requirements.yaml
+++ b/kubernetes/policy/charts/brmsgw/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/policy/charts/brmsgw/resources/config/pe/brmsgw.conf b/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf
index 7f611a1..01c79be 100644
--- a/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf
+++ b/kubernetes/policy/charts/brmsgw/resources/config/pe/brmsgw.conf
@@ -63,5 +63,5 @@
 BRMS_UEB_API_SECRET=
 
 #Dependency.json file version
-BRMS_DEPENDENCY_VERSION=1.4.0
-BRMS_MODELS_DEPENDENCY_VERSION=2.0.0
+BRMS_DEPENDENCY_VERSION=1.4.2
+BRMS_MODELS_DEPENDENCY_VERSION=2.0.2
diff --git a/kubernetes/policy/charts/drools/Chart.yaml b/kubernetes/policy/charts/drools/Chart.yaml
index 31c8b6d..c6b11a4 100644
--- a/kubernetes/policy/charts/drools/Chart.yaml
+++ b/kubernetes/policy/charts/drools/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Drools Policy Engine 
 name: drools
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml b/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml
index 1125e49..d7ff043 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Policy Nexus
 name: nexus
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/drools/charts/nexus/requirements.yaml b/kubernetes/policy/charts/drools/charts/nexus/requirements.yaml
index 68a7d9e..05d49a8 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/requirements.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/policy/charts/drools/charts/nexus/values.yaml b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
index 62a17e5..5d85f6c 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/values.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
@@ -29,7 +29,7 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: sonatype/nexus:2.14.8-01
+image: sonatype/nexus:2.14.13-01
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/charts/drools/requirements.yaml b/kubernetes/policy/charts/drools/requirements.yaml
index 68a7d9e..05d49a8 100644
--- a/kubernetes/policy/charts/drools/requirements.yaml
+++ b/kubernetes/policy/charts/drools/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/policy/charts/mariadb/Chart.yaml b/kubernetes/policy/charts/mariadb/Chart.yaml
index a6493b4..59bd592 100644
--- a/kubernetes/policy/charts/mariadb/Chart.yaml
+++ b/kubernetes/policy/charts/mariadb/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Policy MariaDB Service
 name: mariadb
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/mariadb/requirements.yaml b/kubernetes/policy/charts/mariadb/requirements.yaml
index 68a7d9e..05d49a8 100644
--- a/kubernetes/policy/charts/mariadb/requirements.yaml
+++ b/kubernetes/policy/charts/mariadb/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/policy/charts/mariadb/values.yaml b/kubernetes/policy/charts/mariadb/values.yaml
index fcd7093..15c75b7 100644
--- a/kubernetes/policy/charts/mariadb/values.yaml
+++ b/kubernetes/policy/charts/mariadb/values.yaml
@@ -25,7 +25,7 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: mariadb:10.2.14
+image: mariadb:10.2.25
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/charts/pdp/Chart.yaml b/kubernetes/policy/charts/pdp/Chart.yaml
index 5c228c6..d17329a 100644
--- a/kubernetes/policy/charts/pdp/Chart.yaml
+++ b/kubernetes/policy/charts/pdp/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Policy PDP
 name: pdp
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/pdp/requirements.yaml b/kubernetes/policy/charts/pdp/requirements.yaml
index 68a7d9e..05d49a8 100644
--- a/kubernetes/policy/charts/pdp/requirements.yaml
+++ b/kubernetes/policy/charts/pdp/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/policy/charts/policy-apex-pdp/Chart.yaml b/kubernetes/policy/charts/policy-apex-pdp/Chart.yaml
index 592180f..34bd140 100644
--- a/kubernetes/policy/charts/policy-apex-pdp/Chart.yaml
+++ b/kubernetes/policy/charts/policy-apex-pdp/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP Policy APEX PDP
 name: policy-apex-pdp
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-apex-pdp/requirements.yaml b/kubernetes/policy/charts/policy-apex-pdp/requirements.yaml
index e4bbf69..138addd 100644
--- a/kubernetes/policy/charts/policy-apex-pdp/requirements.yaml
+++ b/kubernetes/policy/charts/policy-apex-pdp/requirements.yaml
@@ -18,5 +18,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/policy/charts/policy-api/Chart.yaml b/kubernetes/policy/charts/policy-api/Chart.yaml
index a50c8d9..ad74784 100644
--- a/kubernetes/policy/charts/policy-api/Chart.yaml
+++ b/kubernetes/policy/charts/policy-api/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP Policy Design API
 name: policy-api
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-api/requirements.yaml b/kubernetes/policy/charts/policy-api/requirements.yaml
index 768bdb3..316e7e3 100644
--- a/kubernetes/policy/charts/policy-api/requirements.yaml
+++ b/kubernetes/policy/charts/policy-api/requirements.yaml
@@ -18,5 +18,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/policy/charts/policy-common/Chart.yaml b/kubernetes/policy/charts/policy-common/Chart.yaml
index 8c5553d..028a5b5 100644
--- a/kubernetes/policy/charts/policy-common/Chart.yaml
+++ b/kubernetes/policy/charts/policy-common/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Policy Common
 name: policy-common
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-common/requirements.yaml b/kubernetes/policy/charts/policy-common/requirements.yaml
index 68a7d9e..05d49a8 100644
--- a/kubernetes/policy/charts/policy-common/requirements.yaml
+++ b/kubernetes/policy/charts/policy-common/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/policy/charts/policy-distribution/Chart.yaml b/kubernetes/policy/charts/policy-distribution/Chart.yaml
index 40abc91..e6c8910 100644
--- a/kubernetes/policy/charts/policy-distribution/Chart.yaml
+++ b/kubernetes/policy/charts/policy-distribution/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP Policy Distribution
 name: policy-distribution
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-distribution/requirements.yaml b/kubernetes/policy/charts/policy-distribution/requirements.yaml
index e4bbf69..138addd 100644
--- a/kubernetes/policy/charts/policy-distribution/requirements.yaml
+++ b/kubernetes/policy/charts/policy-distribution/requirements.yaml
@@ -18,5 +18,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/policy/charts/policy-pap/Chart.yaml b/kubernetes/policy/charts/policy-pap/Chart.yaml
index dccf45d..85e44e7 100644
--- a/kubernetes/policy/charts/policy-pap/Chart.yaml
+++ b/kubernetes/policy/charts/policy-pap/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP Policy Administration (PAP)
 name: policy-pap
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-pap/requirements.yaml b/kubernetes/policy/charts/policy-pap/requirements.yaml
index 849db83..f035fb9 100644
--- a/kubernetes/policy/charts/policy-pap/requirements.yaml
+++ b/kubernetes/policy/charts/policy-pap/requirements.yaml
@@ -18,5 +18,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/policy/charts/policy-xacml-pdp/Chart.yaml b/kubernetes/policy/charts/policy-xacml-pdp/Chart.yaml
index be4325e..d9f6056 100644
--- a/kubernetes/policy/charts/policy-xacml-pdp/Chart.yaml
+++ b/kubernetes/policy/charts/policy-xacml-pdp/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: ONAP Policy XACML PDP
 name: policy-xacml-pdp
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/policy/charts/policy-xacml-pdp/requirements.yaml b/kubernetes/policy/charts/policy-xacml-pdp/requirements.yaml
index 768bdb3..316e7e3 100644
--- a/kubernetes/policy/charts/policy-xacml-pdp/requirements.yaml
+++ b/kubernetes/policy/charts/policy-xacml-pdp/requirements.yaml
@@ -18,5 +18,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/policy/requirements.yaml b/kubernetes/policy/requirements.yaml
index 68a7d9e..05d49a8 100644
--- a/kubernetes/policy/requirements.yaml
+++ b/kubernetes/policy/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/pomba/Chart.yaml b/kubernetes/pomba/Chart.yaml
index b1899fd..fca1743 100644
--- a/kubernetes/pomba/Chart.yaml
+++ b/kubernetes/pomba/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Post Orchestration Model Based Audit
 name: pomba
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml
index 7ec60c5..d5ea123 100644
--- a/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-aaictxbuilder/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP POMBA AAI Context Builder
 name: pomba-aaictxbuilder
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml
index 509eadd..a12911b 100644
--- a/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-aaictxbuilder/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml
index 77182fb..05ed295 100644
--- a/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP POMBA Context Aggregator
 name: pomba-contextaggregator
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml
index 1d30dfd..1063d17 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-data-router/Chart.yaml b/kubernetes/pomba/charts/pomba-data-router/Chart.yaml
index 5d91c65..9504790 100644
--- a/kubernetes/pomba/charts/pomba-data-router/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-data-router/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP POMBA Data-Router
 name: pomba-data-router
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml b/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml
index e62e7fd..cf1fd2d 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-elasticsearch/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP POMBA Elasticsearch
 name: pomba-elasticsearch
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml b/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml
index 1d30dfd..1063d17 100644
--- a/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-elasticsearch/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-kibana/Chart.yaml b/kubernetes/pomba/charts/pomba-kibana/Chart.yaml
index d732104..c53fe6d 100644
--- a/kubernetes/pomba/charts/pomba-kibana/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-kibana/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP POMBA Kibana
 name: pomba-kibana
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-kibana/requirements.yaml b/kubernetes/pomba/charts/pomba-kibana/requirements.yaml
index 1d30dfd..1063d17 100644
--- a/kubernetes/pomba/charts/pomba-kibana/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-kibana/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml
index eb27414..0565c3e 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP POMBA Network Discovery
 name: pomba-networkdiscovery
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml
index 1e8f79b..4b6860c 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml
index 4479e09..f3b18a5 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP POMBA Network Discovery Context Builder
 name: pomba-networkdiscoveryctxbuilder
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml
index 509eadd..a12911b 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml
index c77e28d..4b1fa9c 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-sdcctxbuilder/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP POMBA SDC Context Builder
 name: pomba-sdcctxbuilder
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml
index 1d30dfd..1063d17 100644
--- a/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-sdcctxbuilder/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml
index 2acbe53..dcaeddb 100644
--- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-sdncctxbuilder/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP POMBA SDNC Context Builder
 name: pomba-sdncctxbuilder
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml b/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml
index 509eadd..a12911b 100644
--- a/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-sdncctxbuilder/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-search-data/Chart.yaml b/kubernetes/pomba/charts/pomba-search-data/Chart.yaml
index bd5bdb6..633a062 100644
--- a/kubernetes/pomba/charts/pomba-search-data/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-search-data/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP POMBA search-data
 name: pomba-search-data
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml
index 153e98d..3d2efd5 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP POMBA Network Discovery Service Decomposition
 name: pomba-servicedecomposition
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml b/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml
index d64f5a3..01448d5 100644
--- a/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-servicedecomposition/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml b/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml
index 020409d..4dd05d2 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml
+++ b/kubernetes/pomba/charts/pomba-validation-service/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: POMBA Validaton-Service
 name: pomba-validation-service
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml b/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml
index 71fbbc5..79d7de4 100644
--- a/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml
+++ b/kubernetes/pomba/charts/pomba-validation-service/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/pomba/requirements.yaml b/kubernetes/pomba/requirements.yaml
index 845a5fe..5406430 100644
--- a/kubernetes/pomba/requirements.yaml
+++ b/kubernetes/pomba/requirements.yaml
@@ -14,7 +14,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/portal/Chart.yaml b/kubernetes/portal/Chart.yaml
index 8ab304f..08ed655 100644
--- a/kubernetes/portal/Chart.yaml
+++ b/kubernetes/portal/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Web Portal
 name: portal
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-app/Chart.yaml b/kubernetes/portal/charts/portal-app/Chart.yaml
index 0df66c8..e7ee96c 100644
--- a/kubernetes/portal/charts/portal-app/Chart.yaml
+++ b/kubernetes/portal/charts/portal-app/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Portal application
 name: portal-app
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/portal/charts/portal-cassandra/Chart.yaml b/kubernetes/portal/charts/portal-cassandra/Chart.yaml
index 1f0252b..5511e34 100644
--- a/kubernetes/portal/charts/portal-cassandra/Chart.yaml
+++ b/kubernetes/portal/charts/portal-cassandra/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Portal cassandra
 name: portal-cassandra
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-mariadb/Chart.yaml b/kubernetes/portal/charts/portal-mariadb/Chart.yaml
index f6cf25d..7b2ea08 100644
--- a/kubernetes/portal/charts/portal-mariadb/Chart.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: MariaDB Service
 name: portal-mariadb
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-mariadb/templates/service.yaml b/kubernetes/portal/charts/portal-mariadb/templates/service.yaml
index 4580e56..5ef05c9 100644
--- a/kubernetes/portal/charts/portal-mariadb/templates/service.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/templates/service.yaml
@@ -28,7 +28,7 @@
   ports:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.internalPort }}
-      nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.externalPort }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.externalPort }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/portal/charts/portal-sdk/Chart.yaml b/kubernetes/portal/charts/portal-sdk/Chart.yaml
index bb85ea6..6d13062 100644
--- a/kubernetes/portal/charts/portal-sdk/Chart.yaml
+++ b/kubernetes/portal/charts/portal-sdk/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Portal software development kit
 name: portal-sdk
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-widget/Chart.yaml b/kubernetes/portal/charts/portal-widget/Chart.yaml
index b7617c9..1f3a807 100644
--- a/kubernetes/portal/charts/portal-widget/Chart.yaml
+++ b/kubernetes/portal/charts/portal-widget/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Portal widgets micro service application
 name: portal-widget
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-zookeeper/Chart.yaml b/kubernetes/portal/charts/portal-zookeeper/Chart.yaml
index b6bacff..021f359 100644
--- a/kubernetes/portal/charts/portal-zookeeper/Chart.yaml
+++ b/kubernetes/portal/charts/portal-zookeeper/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: Zookeeper for ONAP Portal
 name: portal-zookeeper
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/portal/charts/portal-zookeeper/templates/service.yaml b/kubernetes/portal/charts/portal-zookeeper/templates/service.yaml
index 4580e56..5ef05c9 100644
--- a/kubernetes/portal/charts/portal-zookeeper/templates/service.yaml
+++ b/kubernetes/portal/charts/portal-zookeeper/templates/service.yaml
@@ -28,7 +28,7 @@
   ports:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.internalPort }}
-      nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.externalPort }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.externalPort }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/portal/requirements.yaml b/kubernetes/portal/requirements.yaml
index 0ba9e47..57ee781 100644
--- a/kubernetes/portal/requirements.yaml
+++ b/kubernetes/portal/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/readiness/docker/init/job_complete.py b/kubernetes/readiness/docker/init/job_complete.py
index b20cb5a..a9570c5 100644
--- a/kubernetes/readiness/docker/init/job_complete.py
+++ b/kubernetes/readiness/docker/init/job_complete.py
@@ -20,7 +20,8 @@
 # setup logging
 log = logging.getLogger(__name__)
 handler = logging.StreamHandler(sys.stdout)
-handler.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)s'))
+formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+handler.setFormatter(formatter)
 handler.setLevel(logging.INFO)
 log.addHandler(handler)
 log.setLevel(logging.INFO)
@@ -54,17 +55,22 @@
 
 DEF_TIMEOUT = 10
 DESCRIPTION = "Kubernetes container job complete check utility"
-USAGE = "Usage: job_complete.py [-t <timeout>] -j <job_name> [-j <job_name> ...]\n" \
+USAGE = "Usage: job_complete.py [-t <timeout>] -j <job_name> " \
+        "[-j <job_name> ...]\n" \
         "where\n" \
-        "<timeout> - wait for container job complete timeout in min, default is " + str(DEF_TIMEOUT) + "\n" \
+        "<timeout> - wait for container job complete timeout in min, " \
+        "default is " + str(DEF_TIMEOUT) + "\n" \
         "<job_name> - name of the job to wait for\n"
 
+
 def main(argv):
     # args are a list of job names
     job_names = []
     timeout = DEF_TIMEOUT
     try:
-        opts, args = getopt.getopt(argv, "hj:t:", ["job-name=", "timeout=", "help"])
+        opts, args = getopt.getopt(argv, "hj:t:", ["job-name=",
+                                                   "timeout=",
+                                                   "help"])
         for opt, arg in opts:
             if opt in ("-h", "--help"):
                 print("%s\n\n%s" % (DESCRIPTION, USAGE))
@@ -89,11 +95,14 @@
             if complete is True:
                 break
             elif time.time() > timeout:
-                log.warning("timed out waiting for '" + job_name + "' to be completed")
+                log.warning("timed out waiting for '" + job_name +
+                            "' to be completed")
                 exit(1)
             else:
-                # spread in time potentially parallel execution in multiple containers
+                # spread in time potentially parallel execution in multiple
+                # containers
                 time.sleep(random.randint(5, 11))
 
+
 if __name__ == "__main__":
-    main(sys.argv[1:])
\ No newline at end of file
+    main(sys.argv[1:])
diff --git a/kubernetes/readiness/docker/init/ready.py b/kubernetes/readiness/docker/init/ready.py
index 0e133ea..db7105a 100644
--- a/kubernetes/readiness/docker/init/ready.py
+++ b/kubernetes/readiness/docker/init/ready.py
@@ -20,7 +20,8 @@
 # setup logging
 log = logging.getLogger(__name__)
 handler = logging.StreamHandler(sys.stdout)
-handler.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)s'))
+formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+handler.setFormatter(formatter)
 handler.setLevel(logging.INFO)
 log.addHandler(handler)
 log.setLevel(logging.INFO)
@@ -31,14 +32,14 @@
 configuration.api_key['authorization'] = token
 configuration.api_key_prefix['authorization'] = 'Bearer'
 coreV1Api = client.CoreV1Api(client.ApiClient(configuration))
-api_instance=client.ExtensionsV1beta1Api(client.ApiClient(configuration))
+api_instance = client.ExtensionsV1beta1Api(client.ApiClient(configuration))
 api = client.AppsV1beta1Api(client.ApiClient(configuration))
 batchV1Api = client.BatchV1Api(client.ApiClient(configuration))
 
+
 def is_job_complete(job_name):
     complete = False
     log.info("Checking if " + job_name + "  is complete")
-    response = ""
     try:
         response = batchV1Api.read_namespaced_job_status(job_name, namespace)
         if response.status.succeeded == 1:
@@ -54,11 +55,12 @@
     except Exception as e:
         log.error("Exception when calling read_namespaced_job_status: %s\n" % e)
 
+
 def wait_for_statefulset_complete(statefulset_name):
     try:
         response = api.read_namespaced_stateful_set(statefulset_name, namespace)
         s = response.status
-        if ( s.updated_replicas == response.spec.replicas and
+        if (s.updated_replicas == response.spec.replicas and
                 s.replicas == response.spec.replicas and
                 s.ready_replicas == response.spec.replicas and
                 s.current_replicas == response.spec.replicas and
@@ -71,11 +73,12 @@
     except Exception as e:
         log.error("Exception when waiting for Statefulset status: %s\n" % e)
 
+
 def wait_for_deployment_complete(deployment_name):
     try:
         response = api.read_namespaced_deployment(deployment_name, namespace)
         s = response.status
-        if ( s.unavailable_replicas == None and
+        if (s.unavailable_replicas is None and
                 s.updated_replicas == response.spec.replicas and
                 s.replicas == response.spec.replicas and
                 s.ready_replicas == response.spec.replicas and
@@ -88,24 +91,27 @@
     except Exception as e:
         log.error("Exception when waiting for deployment status: %s\n" % e)
 
+
 def is_ready(container_name):
     ready = False
     log.info("Checking if " + container_name + "  is ready")
     try:
-        response = coreV1Api.list_namespaced_pod(namespace=namespace, watch=False)
+        response = coreV1Api.list_namespaced_pod(namespace=namespace,
+                                                 watch=False)
         for i in response.items:
             # container_statuses can be None, which is non-iterable.
             if i.status.container_statuses is None:
                 continue
             for s in i.status.container_statuses:
                 if s.name == container_name:
-                    if i.metadata.owner_references[0].kind  == "StatefulSet":
-                        ready = wait_for_statefulset_complete(i.metadata.owner_references[0].name)
+                    name = read_name(i)
+                    if i.metadata.owner_references[0].kind == "StatefulSet":
+                        ready = wait_for_statefulset_complete(name)
                     elif i.metadata.owner_references[0].kind == "ReplicaSet":
-                        api_response = api_instance.read_namespaced_replica_set_status(i.metadata.owner_references[0].name, namespace)
-                        ready = wait_for_deployment_complete(api_response.metadata.owner_references[0].name)
+                        deployment_name = get_deployment_name(name)
+                        ready = wait_for_deployment_complete(deployment_name)
                     elif i.metadata.owner_references[0].kind == "Job":
-                        ready = is_job_complete(i.metadata.owner_references[0].name)
+                        ready = is_job_complete(name)
 
                     return ready
 
@@ -115,19 +121,36 @@
     except Exception as e:
         log.error("Exception when calling list_namespaced_pod: %s\n" % e)
 
+
+def read_name(item):
+    return item.metadata.owner_reference[0].name
+
+
+def get_deployment_name(replicaset):
+    api_response = api_instance.read_namespaced_replica_set_status(replicaset,
+                                                                   namespace)
+    deployment_name = read_name(api_response)
+    return deployment_name
+
+
 DEF_TIMEOUT = 10
 DESCRIPTION = "Kubernetes container readiness check utility"
-USAGE = "Usage: ready.py [-t <timeout>] -c <container_name> [-c <container_name> ...]\n" \
+USAGE = "Usage: ready.py [-t <timeout>] -c <container_name> " \
+        "[-c <container_name> ...]\n" \
         "where\n" \
-        "<timeout> - wait for container readiness timeout in min, default is " + str(DEF_TIMEOUT) + "\n" \
+        "<timeout> - wait for container readiness timeout in min, " \
+        "default is " + str(DEF_TIMEOUT) + "\n" \
         "<container_name> - name of the container to wait for\n"
 
+
 def main(argv):
     # args are a list of container names
     container_names = []
     timeout = DEF_TIMEOUT
     try:
-        opts, args = getopt.getopt(argv, "hc:t:", ["container-name=", "timeout=", "help"])
+        opts, args = getopt.getopt(argv, "hc:t:", ["container-name=",
+                                                   "timeout=",
+                                                   "help"])
         for opt, arg in opts:
             if opt in ("-h", "--help"):
                 print("%s\n\n%s" % (DESCRIPTION, USAGE))
@@ -152,12 +175,15 @@
             if ready is True:
                 break
             elif time.time() > timeout:
-                log.warning("timed out waiting for '" + container_name + "' to be ready")
+                log.warning("timed out waiting for '" + container_name +
+                            "' to be ready")
                 exit(1)
             else:
-                # spread in time potentially parallel execution in multiple containers
+                # spread in time potentially parallel execution in multiple
+                # containers
                 time.sleep(random.randint(5, 11))
 
+
 if __name__ == "__main__":
     main(sys.argv[1:])
 
diff --git a/kubernetes/robot/Chart.yaml b/kubernetes/robot/Chart.yaml
index 6ccc7a3..7dbed54 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/robot/onap_dev.pvt b/kubernetes/robot/onap_dev.pvt
new file mode 100644
index 0000000..81e334a
--- /dev/null
+++ b/kubernetes/robot/onap_dev.pvt
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAylw4KKN/ljqnFBvP+blG5PNfsnM4MAuGPMsE5rkKmzcZWNaE
+NGMXTFKlJ4YrUl7OUv8kbgFTmB8BoNpgrNtKACDaz/psQSOeOADCG/YrT4wrYKrR
+NhFqOjJpxRmxweEsd14qBOxeFT7Ie42qbCMMzo260HvjLmtUxkOXeJ3xDkGmoJVy
+yzxX7nO1m4WyWyukO6x6mX0XDsADF4A6AapcqinoisJ7pnXaNkcjU/JY2Jrwem7s
++ypzIp86O6gdLpLVU9ORR/UYNAk1h+Z6K5Rual4D9mrpC9IJNaYfIgLe7mC39ZLa
+fiySNoGhei9P6pYvRJlQki69bid/EPAgX5YZIQIDAQABAoIBAQClDekkhI9ZqseC
+qFjPuKaxsizZMg+faJb6WSHLSxzyk1OSWY6F6FklgLeC8HW/fuLNYZyGOYDEsG20
+lMqL02Wdiy7OutS3oOS5iyzIf9a90HfFJi706el6RIpvINETcaXCS0T8tQrcS1Rd
+KqTaBRC6HXJGAPbBcvw3pwQSdskatU6a/Kt2a3x6DsqqinQcgEB/SbrDaJCUX9sb
+F2HVUwdq7aZK1Lk0ozr1FID9mrhjwWuQ6XC+vjG0FqtyXeMpR5iaQ73hex3FXQ8z
+OjkFbMwuHWSh1DSx70r5yFrrBqwQKnMsBqx4QDRf3fIENUnWviaL+n+gwcXA07af
+4kaNUFUtAoGBAPuNNRAGhZnyZ9zguns9PM56nmeMUikV5dPN2DTbQb79cpfV+7pC
+6PeSH/dTKFLz62d6qAM2EsNXQvewf8fipBVBRPsRqKOv+uepd01dHNy62I5B+zRm
+be9Kbe+EN60qdzvyPM+2hV6CnvGv1dirimS9pu6RrxD2Rmz1ectnJE+rAoGBAM3w
+UbSEemyZ6EKjck2RfdipzY0MNBnIZ2cUqHh8mmPXjdTLzpXb9vmPbHb01Qwo8MP+
+gMnTbTBOzyNAaHdIrCO9FHW6C85j3ot5Yzcr+EcBVcua+7KHU0Sgn44JNH8DisJ7
+Y63UP/1Xb4d1/QvHfxYy3WOvvRdVZ7pPo8JNX95jAoGAIe5CIg8/JizUZa7KeKUh
+9pgDleQPkQsrHQ6/AyIwFBsLwf9THSS5V+uV9D57SfUs46Bf2U8J6N90YQSlt8iS
+aWuManFPVgT+yxDIzt6obf2mCEpOIBtQ6N4ZRh2HhQwdWTCrkzkDdGQaHG+jYL6C
+xGPwiG2ON7OAfGIAM7eN5lECgYEAhoRLWlaOgRGnHKAWsYQvZ67CjTdDcPPuVu6v
+fMQnNMA/7JeTwV+E205L0wfpgZ/cZKmBBlQMJlnUA3q2wfO+PTnse1mjDJU/cGtB
+22/lJLxChlQdxGeQhGtGzUhF+hEeOhrO6WSSx7CtMRZoy6Dr6lwfMFZCdVNcBd6v
+YOOZk3ECgYEAseUKGb6E80XTVVNziyuiVbQCsI0ZJuRfqMZ2IIDQJU9u6AnGAway
+itqHbkGsmDT+4HUz01+1JKnnw42RdSrHdU/LaOonD+RIGqe2x800QXzqASKLdCXr
+y7RoiFqJtkdFQykzJemA+xOXvHLgKi/MXFsU90PCD0VJKLj8vwpX78Y=
+-----END RSA PRIVATE KEY-----
diff --git a/kubernetes/robot/requirements.yaml b/kubernetes/robot/requirements.yaml
index 3ee610f..537ede6 100644
--- a/kubernetes/robot/requirements.yaml
+++ b/kubernetes/robot/requirements.yaml
@@ -14,7 +14,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/robot/resources/config/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
deleted file mode 100644
index d58e138..0000000
--- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
+++ /dev/null
@@ -1,542 +0,0 @@
-# Copyright (c) 2018 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import json
-import os.path
-from itertools import chain
-from collections import defaultdict
-
-
-GLOBAL_PRELOAD_PARAMETERS = {
-    # heat template parameter values common to all heat template continaing these parameters
-     "defaults" : {
-         'key_name' : 'vfw_key${uuid}',
-         "pub_key" : "{{ .Values.vnfPubKey }}",
-         "repo_url_blob" : "https://nexus.onap.org/content/repositories/raw",
-         "repo_url_artifacts" : "{{ .Values.demoArtifactsRepoUrl }}",
-         "demo_artifacts_version" : "${GLOBAL_INJECTED_ARTIFACTS_VERSION}",
-         "onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}",
-         "onap_private_subnet_id" : "{{ .Values.openStackPrivateSubnetId }}",
-         "onap_private_net_cidr" : "{{ .Values.openStackPrivateNetCidr }}",
-         "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-         "dcae_collector_ip" : "{{ .Values.dcaeCollectorIp }}",
-         "dcae_collector_port" : "30235",
-         "public_net_id" : "${GLOBAL_INJECTED_PUBLIC_NET_ID}",
-         "cloud_env" : "${GLOBAL_INJECTED_CLOUD_ENV}",
-         "install_script_version" : "${GLOBAL_INJECTED_SCRIPT_VERSION}",
-     },
-    # ##
-    # heat template parameter values for heat template instances created during Vnf-Orchestration test cases
-    # ##
-    "Vnf-Orchestration" : {
-        "vfw_preload.template": {
-            "unprotected_private_net_id" : "vofwl01_unprotected${hostid}",
-            "unprotected_private_net_cidr" : "192.168.10.0/24",
-            "protected_private_net_id" : "vofwl01_protected${hostid}",
-            "protected_private_net_cidr" : "192.168.20.0/24",
-            "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
-            "vfw_int_protected_private_ip_0" : "192.168.20.100",
-            "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.1",
-            "vfw_int_protected_private_floating_ip" : "192.168.10.200",
-            "vpg_int_unprotected_private_ip_0" : "192.168.10.200",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.2",
-            "vsn_int_protected_private_ip_0" : "192.168.20.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.3",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vfw_name_0':'vofwl01fwl${hostid}',
-            'vpg_name_0':'vofwl01pgn${hostid}',
-            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            'vsn_name_0':'vofwl01snk${hostid}'
-        },
-        "vfwsnk_preload.template": {
-            "int_unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
-            "int_unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
-            "unprotected_private_net_cidr" : "192.168.10.0/24",
-            "int_protected_private_net_id" : "vofwlsnk_protected${hostid}",
-            "int_protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}",
-            "protected_private_net_cidr" : "192.168.20.0/24",
-            "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
-            # this should be the same value as vpg_private_ip_0
-            "vfw_int_protected_private_floating_ip" : "192.168.10.200",
-            "vfw_int_protected_private_ip_0" : "192.168.20.100",
-            "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.101",
-            "vsn_int_protected_private_ip_0" : "192.168.20.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.102",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vfw_name_0':'vofwl01fwl${hostid}',
-            'vsn_name_0':'vofwl01snk${hostid}',
-            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-        },
-        "vpkg_preload.template": {
-            # vFWSNK_ prepended to vpkg since the default behoir for vFWSNK tempalte is to concatenate vnf_name and network_name
-            "unprotected_private_net_id" : "vFWSNK_vofwlsnk_unprotected${hostid}",
-            "unprotected_private_subnet_id" : "vFWSNK_vofwlsnk_unprotected_sub${hostid}",
-            "unprotected_private_net_cidr" : "192.168.10.0/24",
-            "protected_private_net_cidr" : "192.168.20.0/24",
-            "vfw_private_ip_0" : "192.168.10.100",
-            "vpg_unprotected_private_ip_0" : "192.168.10.200",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vpg_name_0':'vofwl01pgn${hostid}',
-            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-        },
-        #  vFWDT preload data
-        "vfwdt_vpkg_preload.template": {
-            "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
-            "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
-            "unprotected_private_net_cidr" : "192.168.10.0/24",
-            "protected_private_net_cidr" : "192.168.20.0/24",
-            "vfw_private_ip_0" : "192.168.10.100",
-            "vpg_private_ip_0" : "192.168.10.200",
-            "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vpg_name_0':'vofwl01pgn${hostid}',
-            "vfw_name_0": "vofwl01vfw${hostid}",
-            "vsn_name_0": "vofwl01snk${hostid}",
-            "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "protected_private_net_id" : "vofwlsnk01_protected${hostid}",
-            "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}",
-            "ext_private_net_id": "onap_oam_ext",
-            "ext_private_subnet_id": "onap_oam_ext_sub",
-            "ext_private_net_cidr": "10.100.0.0/16",
-            "vfw_private_ip_1": "192.168.20.100",
-            "vfw_private_ip_2": "10.0.110.1",
-            "vfw_private_ip_3": "10.100.100.1",
-            "vsn_private_ip_1": "10.0.110.3",
-            "vsn_private_ip_0": "192.168.20.250",
-            "vsn_private_ip_2": "10.100.100.3",
-        },
-        "vfwdt_vfwsnk0_preload.template": {
-            "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
-            "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
-            "unprotected_private_net_cidr" : "192.168.10.0/24",
-            "protected_private_net_cidr" : "192.168.20.0/24",
-            "vfw_private_ip_0" : "192.168.10.100",
-            "vpg_private_ip_0" : "192.168.10.200",
-            "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vpg_name_0':'vofwl01pgn${hostid}',
-            "vsn_name_0": "vofwl01snk${hostid}",
-            "vfw_name_0": "vofwl01vfw${hostid}",
-            "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "protected_private_net_id" : "vofwlsnk01_protected${hostid}",
-            "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}",
-            "ext_private_net_id": "onap_oam_ext",
-            "ext_private_subnet_id": "onap_oam_ext_sub",
-            "ext_private_net_cidr": "10.100.0.0/16",
-            "vfw_private_ip_1": "192.168.20.100",
-            "vfw_private_ip_2": "10.0.110.1",
-            "vfw_private_ip_3": "10.100.100.1",
-            "vsn_private_ip_1": "10.0.110.3",
-            "vsn_private_ip_0": "192.168.20.250",
-            "vpg_private_ip_2": "10.100.100.2",
-            "vsn_private_ip_1": "10.0.110.3",
-            "vsn_private_ip_0": "192.168.20.250",
-            "vsn_private_ip_2": "10.100.100.3"
-        },
-        "vfwdt_vfwsnk1_preload.template": {
-            "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
-            "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
-            "unprotected_private_net_cidr" : "192.168.10.0/24",
-            "protected_private_net_cidr" : "192.168.20.0/24",
-            "vfw_private_ip_0" : "192.168.10.110",
-            "vpg_private_ip_0" : "192.168.10.200",
-            "vpg_private_ip_1" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vpg_name_0':'vofwl01pgn${hostid}',
-            "vsn_name_0": "vofwl01snk${hostid}",
-            "vfw_name_0": "vofwl01vfw${hostid}",
-            "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "protected_private_net_id" : "vofwlsnk01_protected${hostid}",
-            "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}",
-            "ext_private_net_id": "onap_oam_ext",
-            "ext_private_subnet_id": "onap_oam_ext_sub",
-            "ext_private_net_cidr": "10.100.0.0/16",
-            "vfw_private_ip_1": "192.168.20.110",
-            "vfw_private_ip_2": "10.0.110.4",
-            "vfw_private_ip_3": "10.100.100.4",
-            "vpg_private_ip_0": "192.168.10.200",
-            "vpg_private_ip_1": "10.0.110.2",
-            "vpg_private_ip_2": "10.100.100.2",
-            "vsn_private_ip_0": "192.168.20.240",
-            "vsn_private_ip_1": "10.0.110.5",
-            "vsn_private_ip_2": "10.100.100.5"
-        },
-        "vlb_preload.template" : {
-            "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
-            "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
-            "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
-            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            'vlb_name_0':'vovlblb${hostid}',
-            'vdns_name_0':'vovlbdns${hostid}',
-            "vpg_name_0" : "vovlbpgn${hostid}",
-            "vlb_private_net_id" : "volb01_private${hostid}",
-            "vlb_private_net_cidr" : "192.168.30.0/24",
-            "pktgen_private_net_id" : "volb01_pktgen${hostid}",
-            "pktgen_private_net_cidr" : "192.168.9.0/24",
-            "vlb_int_private_ip_0" : "192.168.30.100",
-            "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.4",
-            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
-            "vdns_int_private_ip_0" : "192.168.30.110",
-            "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.5",
-            "vpg_int_pktgen_private_ip_0" : "192.168.9.110",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.7",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            "pg_int" : "192.168.9.109",
-            "vip" : "192.168.9.112",
-            "gre_ipaddr" : "192.168.30.112",
-            "vnf_id" : "vLoadBalancer_${hostid}",
-            "vf_module_id" : "vLoadBalancer"
-
-        },
-        "dnsscaling_preload.template" : {
-            "int_private_net_id" : "vLBMS_volb01_private${hostid}",
-            "int_private_subnet_id" : "vLBMS_volb01_private${hostid}_subnet",
-            "vlb_int_private_ip_0" : "192.168.30.100",
-            "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.4",
-            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
-            "vdns_int_private_ip_0" : "192.168.30.222",
-            "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.6",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vdns_name_0':'vovlbscaling${hostid}',
-            "vlb_private_net_cidr" : "192.168.30.0/24"
-        },
-        "vims_preload.template" : {
-            "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "repo_url" : "http://repo.cw-ngv.com/stable",
-            "zone" : "me.cw-ngv.com",
-            "dn_range_start" : "2425550000",
-            "dn_range_length" : "10000",
-            "dnssec_key" : "9FPdYTWhk5+LbhrqtTPQKw=="
-
-        },
-        "vvg_preload.template" : {
-        }
-    },
-# heat template parameter values for heat template instances created during Closed-Loop test cases
-    "Closed-Loop" : {
-        "vfw_preload.template": {
-            "unprotected_private_net_id" : "clfwl01_unprotected${hostid}",
-            "unprotected_private_net_cidr" : "192.168.110.0/24",
-            "protected_private_net_id" : "clfwl01_protected${hostid}",
-            "protected_private_net_cidr" : "192.168.120.0/24",
-            "vfw_int_unprotected_private_ip_0" : "192.168.110.100",
-            "vfw_int_protected_private_ip_0" : "192.168.120.100",
-            "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.11",
-            "vfw_int_protected_private_floating_ip" : "192.168.110.200",
-            "vpg_int_unprotected_private_ip_0" : "192.168.110.200",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12",
-            "vsn_int_protected_private_ip_0" : "192.168.120.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vfw_name_0':'clfwl01fwl${hostid}',
-            'vpg_name_0':'clfwl01pgn${hostid}',
-            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            'vsn_name_0':'clfwl01snk${hostid}'
-        },
-        "vfwsnk_preload.template": {
-            "int_unprotected_private_net_id" : "clfwlsnk_unprotected${hostid}",
-            "int_unprotected_private_subnet_id" : "clfwlsnk_unprotected_sub${hostid}",
-            "unprotected_private_net_cidr" : "192.168.10.0/24",
-            "int_protected_private_net_id" : "clfwlsnk_protected${hostid}",
-            "int_protected_private_subnet_id" : "clfwlsnk_protected_sub${hostid}",
-            "protected_private_net_cidr" : "192.168.20.0/24",
-            "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
-            # this should be the same value as vpg_private_ip_0
-            "vfw_int_protected_private_floating_ip" : "192.168.10.200",
-            "vfw_int_protected_private_ip_0" : "192.168.20.100",
-            "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.111",
-            "vsn_int_protected_private_ip_0" : "192.168.20.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.112",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vfw_name_0':'clfwl01fwl${hostid}',
-            'vsn_name_0':'clfwl01snk${hostid}',
-            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-        },
-        "vpkg_preload.template": {
-            "unprotected_private_net_id" : "vFWSNK_clfwlsnk_unprotected${hostid}",
-            "unprotected_private_subnet_id" : "vFWSNK_clfwlsnk_unprotected_sub${hostid}",
-            "unprotected_private_net_cidr" : "192.168.10.0/24",
-            "protected_private_net_cidr" : "192.168.20.0/24",
-            "vfw_private_ip_0" : "192.168.10.100",
-            "vpg_unprotected_private_ip_0" : "192.168.10.200",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.113",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vpg_name_0':'clfwl01pgn${hostid}',
-            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-        },
-        # vLBMS
-        "vlb_preload.template" : {
-            "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
-            "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
-            "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
-            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            'vlb_name_0':'clvlblb${hostid}',
-            'vdns_name_0':'clvlbdns${hostid}',
-            "vpg_name_0" : "clvlbpgn${hostid}",
-            "vlb_private_net_id" : "cllb01_private${hostid}",
-            "vlb_private_net_cidr" : "192.168.30.0/24",
-            "pktgen_private_net_id" : "cllb01_pktgen${hostid}",
-            "pktgen_private_net_cidr" : "192.168.9.0/24",
-            "vlb_int_private_ip_0" : "192.168.30.100",
-            "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.14",
-            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
-            "vdns_int_private_ip_0" : "192.168.30.110",
-            "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.15",
-            "vpg_int_pktgen_private_ip_0" : "192.168.9.110",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.17",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            "pg_int" : "192.168.9.109",
-            "vip" : "192.168.9.112",
-            "gre_ipaddr" : "192.168.30.112",
-            "vnf_id" : "vLoadBalancer_${hostid}",
-            "vf_module_id" : "vLoadBalancer"
-        },
-        "dnsscaling_preload.template" : {
-            "int_private_net_id" : "vLBMS_cllb01_private${hostid}",
-            "int_private_subnet_id" : "vLBMS_cllb01_private${hostid}_subnet",
-            "vlb_int_private_ip_0" : "192.168.30.100",
-            "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.14",
-            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
-            "vdns_int_private_ip_0" : "192.168.30.222",
-            "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.16",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vdns_name_0':'clvlbscaling${hostid}',
-            "vlb_private_net_cidr" : "192.168.10.0/24"
-        },
-        "vims_preload.template" : {
-            "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "repo_url" : "http://repo.cw-ngv.com/stable",
-            "zone" : "me.cw-ngv.com",
-            "dn_range_start" : "2425550000",
-            "dn_range_length" : "10000",
-            "dnssec_key" : "9FPdYTWhk5+LbhrqtTPQKw=="
-        },
-        "vvg_preload.template" : {
-        }
-    },
- # heat template parameter values for heat template instances created for hands on demo test case
-   "Demo" : {
-        "vfw_preload.template": {
-            "unprotected_private_net_id" : "demofwl_unprotected",
-            "unprotected_private_net_cidr" : "192.168.110.0/24",
-            "protected_private_net_id" : "demofwl_protected",
-            "protected_private_net_cidr" : "192.168.120.0/24",
-            "vfw_int_unprotected_private_ip_0" : "192.168.110.100",
-            "vfw_int_protected_private_ip_0" : "192.168.120.100",
-            "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.11",
-            "vpg_int_unprotected_private_ip_0" : "192.168.110.200",
-            "vfw_int_protected_private_floating_ip" : "192.168.110.200",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12",
-            "vsn_int_protected_private_ip_0" : "192.168.120.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vfw_name_0':'demofwl01fwl',
-            'vpg_name_0':'demofwl01pgn',
-            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            'vsn_name_0':'demofwl01snk'
-        },
-        "vfwsnk_preload.template": {
-            "int_unprotected_private_net_id" : "demofwlsnk_unprotected${hostid}",
-            "int_unprotected_private_subnet_id" : "demofwlsnk_unprotected_sub${hostid}",
-            "unprotected_private_net_cidr" : "192.168.10.0/24",
-            "int_protected_private_net_id" : "demofwlsnk_protected${hostid}",
-            "int_protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}",
-            "protected_private_net_cidr" : "192.168.20.0/24",
-            "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
-            # this should be the same value as vpg_private_ip_0
-            "vfw_int_protected_private_floating_ip" : "192.168.10.200",
-            "vfw_int_protected_private_ip_0" : "192.168.20.100",
-            "vfw_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.121",
-            "vsn_int_protected_private_ip_0" : "192.168.20.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.122",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vfw_name_0':'${generic_vnf_name}',
-            'vsn_name_0':'demofwl01snk${hostid}',
-            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-        },
-        "vpkg_preload.template": {
-            "unprotected_private_net_id" : "vFWSNK_demofwlsnk_unprotected${hostid}",
-            "unprotected_private_subnet_id" : "vFWSNK_demofwlsnk_unprotected_sub${hostid}",
-            "unprotected_private_net_cidr" : "192.168.10.0/24",
-            "protected_private_net_cidr" : "192.168.20.0/24",
-            "vfw_private_ip_0" : "192.168.10.100",
-            "vpg_unprotected_private_ip_0" : "192.168.10.200",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.123",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vpg_name_0':'demofwl01pgn${hostid}',
-            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}"
-        },
-        # vLBMS
-        "vlb_preload.template" : {
-            "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
-            "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
-            "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
-            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            'vlb_name_0':'demovlblb${hostid}',
-            'vdns_name_0':'demovlbdns${hostid}',
-            "vpg_name_0" : "clvlbpgn${hostid}",
-            "vlb_private_net_id" : "demolb_private${hostid}",
-            "vlb_private_net_cidr" : "192.168.30.0/24",
-            "pktgen_private_net_id" : "demolb_pktgen${hostid}",
-            "pktgen_private_net_cidr" : "192.168.9.0/24",
-            "vlb_int_private_ip_0" : "192.168.30.100",
-            "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.24",
-            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
-            "vdns_int_private_ip_0" : "192.168.30.110",
-            "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.25",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.27",
-            "vpg_int_pktgen_private_ip_0" : "192.168.9.110",
-            "pg_int" : "192.168.9.109",
-            "vip" : "192.168.9.112",
-            "gre_ipaddr" : "192.168.30.112",
-            "vnf_id" : "vLoadBalancer_${hostid}",
-            "vf_module_id" : "vLoadBalancer",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}"
-        },
-        "dnsscaling_preload.template" : {
-            "int_private_net_id" : "vLBMS_demolb_private${hostid}",
-            "int_private_subnet_id" : "vLBMS_demolb_private${hostid}_subnet",
-            "vlb_int_private_ip_0" : "192.168.30.100",
-            "vlb_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.24",
-            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
-            "vdns_int_private_ip_0" : "192.168.30.222",
-            "vdns_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.26",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            'vdns_name_0':'demovlbscaling${hostid}',
-            "vlb_private_net_cidr" : "192.168.30.0/24"
-        },
-        "vims_preload.template" : {
-            "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
-            "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
-            "repo_url" : "http://repo.cw-ngv.com/stable",
-            "zone" : "me.cw-ngv.com",
-            "dn_range_start" : "2425550000",
-            "dn_range_length" : "10000",
-            "dnssec_key" : "9FPdYTWhk5+LbhrqtTPQKw=="
-        },
-        "vvg_preload.template" : {
-        }
-    }
-}
-
-
-# Create dictionaries for new MAPPING data to join to original MAPPING data
-GLOBAL_PRELOAD_PARAMETERS2 = {}
-
-
-folder=os.path.join('/var/opt/ONAP/demo/preload_data')
-subfolders = [d for d in os.listdir(folder) if os.path.isdir(os.path.join(folder, d))]
-
-for service in subfolders:
-    filepath=os.path.join('/var/opt/ONAP/demo/preload_data', service, 'preload_data.json')
-    with open(filepath, 'r') as f:
-        preload_data = json.load(f)
-        GLOBAL_PRELOAD_PARAMETERS2['Demo']=preload_data
-
-
-# Merge dictionaries
-#    preload_data.json is for Demo key in GLOBAL_PRELOAD_PARAMETERS
-
-
-GLOBAL_PRELOAD_PARAMETERS3 = {'Demo':{}}
-
-for k, v in chain(GLOBAL_PRELOAD_PARAMETERS['Demo'].items(), GLOBAL_PRELOAD_PARAMETERS2['Demo'].items()):
-    GLOBAL_PRELOAD_PARAMETERS3['Demo'][k] =  v
-#    print(k, v)
-
-GLOBAL_PRELOAD_PARAMETERS =  dict(GLOBAL_PRELOAD_PARAMETERS.items() + GLOBAL_PRELOAD_PARAMETERS3.items())
-
-#print GLOBAL_PRELOAD_PARAMETERS
-
diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
index 1db75b0..429b83e 100644
--- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
@@ -22,8 +22,8 @@
 GLOBAL_AAI_USERNAME = '{{ .Values.aaiUsername }}'
 GLOBAL_AAI_PASSWORD = '{{ .Values.aaiPassword}}'
 # appc info - everything is from the private oam network (also called onap private network)
-GLOBAL_APPC_SERVER_PROTOCOL = "http"
-GLOBAL_APPC_SERVER_PORT = "8282"
+GLOBAL_APPC_SERVER_PROTOCOL = "https"
+GLOBAL_APPC_SERVER_PORT = "8443"
 GLOBAL_APPC_USERNAME = '{{ .Values.appcUsername }}'
 GLOBAL_APPC_PASSWORD = '{{ .Values.appcPassword }}'
 GLOBAL_APPC_CDT_SERVER_PROTOCOL = "https"
@@ -187,5 +187,6 @@
 GLOBAL_PROXY_WARNING_CONTINUE_XPATH=""
 # dns info
 GLOBAL_DNS_TRAFFIC_DURATION = "600"
-# location where heat templates are loaded from
+# location where heat templates and data are loaded from
 GLOBAL_HEAT_TEMPLATES_FOLDER = "/var/opt/ONAP/demo/heat"
+GLOBAL_PRELOAD_DATA_FOLDER = "/var/opt/ONAP/demo/preload-data"
diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index 866a025..a17845d 100644
--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@ -20,9 +20,11 @@
 GLOBAL_INJECTED_APPC_IP_ADDR = 'appc.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_APPC_CDT_IP_ADDR = 'appc-cdt.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_ARTIFACTS_VERSION = '{{.Values.demoArtifactsVersion}}'
+GLOBAL_INJECTED_ARTIFACTS_REPO_URL = "{{ .Values.demoArtifactsRepoUrl }}"
 GLOBAL_INJECTED_CLAMP_IP_ADDR = 'clamp.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_CLI_IP_ADDR = 'cli.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_CLOUD_ENV = 'openstack'
+GLOBAL_INJECTED_DCAE_COLLECTOR_IP = "{{ .Values.dcaeCollectorIp }}"
 GLOBAL_INJECTED_DCAE_IP_ADDR = 'dcae-healthcheck.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_DCAE_VES_HOST = 'dcae-ves-collector.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR = 'dmaap-dr-prov.{{include "common.namespace" .}}'
@@ -64,6 +66,7 @@
 GLOBAL_INJECTED_OPENSTACK_USERNAME = '{{ .Values.openStackUserName }}'
 GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME = '{{ .Values.openStackProjectName }}'
 GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID = '{{ .Values.openStackDomainId }}'
+GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN = '{{ .Values.openStackUserDomain }}'
 GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION = '{{ .Values.openStackKeystoneAPIVersion }}'
 GLOBAL_INJECTED_REGION_THREE = '{{ .Values.openStackRegionRegionThree }}'
 GLOBAL_INJECTED_KEYSTONE_REGION_THREE = '{{ .Values.openStackKeyStoneUrlRegionThree }}'
@@ -71,11 +74,15 @@
 GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE = '{{ .Values.openStackUserNameRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_PASSWORD_REGION_THREE = '{{ .Values.openStackPasswordRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE  = '{{ .Values.openSackMsoEncryptdPasswordRegionThree }}'
+GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD = '{{ .Values.config.openStackSoEncryptedPassword}}'
 GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE = '{{ .Values.openStackTenantIdRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE = '{{ .Values.openStackProjectNameRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE = '{{ .Values.openStackDomainIdRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX = '{{ .Values.openStackOamNetworkCidrPrefix }}'
-GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK = 'public'
+GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK = '{{ .Values.openStackPublicNetworkName }}'
+GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP = '{{ .Values.openStackSecurityGroup }}'
+GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID = "{{ .Values.openStackPrivateSubnetId }}"
+GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR = "{{ .Values.openStackPrivateNetCidr }}"
 GLOBAL_INJECTED_POLICY_IP_ADDR = 'pdp.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_POLICY_DROOLS_IP_ADDR = 'drools.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_PORTAL_IP_ADDR = 'portal-app.{{include "common.namespace" .}}'
@@ -85,6 +92,8 @@
 GLOBAL_INJECTED_POLICY_PDPX_IP_ADDR = 'policy-xacml-pdp.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR = 'policy-apex-pdp.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_PUBLIC_NET_ID = '{{ .Values.openStackPublicNetId }}'
+GLOBAL_INJECTED_PRIVATE_KEY = "{{ .Files.Get .Values.vnfPrivateKey }}"
+GLOBAL_INJECTED_PUBLIC_KEY = "{{ .Values.vnfPubKey }}"
 GLOBAL_INJECTED_REGION = '{{ .Values.openStackRegion }}'
 GLOBAL_INJECTED_SCRIPT_VERSION = '{{ .Values.scriptVersion }}'
 GLOBAL_INJECTED_SDC_BE_IP_ADDR = 'sdc-be.{{include "common.namespace" .}}'
@@ -117,9 +126,11 @@
     "GLOBAL_INJECTED_APPC_IP_ADDR" : 'appc.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_APPC_CDT_IP_ADDR" : 'appc-cdt.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_ARTIFACTS_VERSION" : '{{.Values.demoArtifactsVersion}}',
+    "GLOBAL_INJECTED_ARTIFACTS_REPO_URL" : "{{ .Values.demoArtifactsRepoUrl }}",
     "GLOBAL_INJECTED_CLAMP_IP_ADDR" : 'clamp.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_CLI_IP_ADDR" : 'cli.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_CLOUD_ENV" : 'openstack',
+    "GLOBAL_INJECTED_DCAE_COLLECTOR_IP" : "{{ .Values.dcaeCollectorIp }}",
     "GLOBAL_INJECTED_DCAE_IP_ADDR" : 'dcae-healthcheck.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_DCAE_VES_HOST" : 'dcae-ves-collector.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR" : 'dmaap-dr-prov.{{include "common.namespace" .}}',
@@ -157,6 +168,7 @@
     "GLOBAL_INJECTED_OPENSTACK_USERNAME" : '{{ .Values.openStackUserName }}',
     "GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME" : '{{ .Values.openStackProjectName }}',
     "GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID" : '{{ .Values.openStackDomainId }}',
+    "GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN" : '{{ .Values.openStackUserDomain }}',
     "GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION" : '{{ .Values.openStackKeystoneAPIVersion }}',
     "GLOBAL_INJECTED_REGION_THREE" : '{{ .Values.openStackRegionRegionThree }}',
     "GLOBAL_INJECTED_KEYSTONE_REGION_THREE" : '{{ .Values.openStackKeyStoneUrlRegionThree }}',
@@ -164,11 +176,15 @@
     "GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE" : '{{ .Values.openStackUserNameRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_PASSWORD_REGION_THREE" : '{{ .Values.openStackPasswordRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE" : '{{ .Values.openSackMsoEncryptdPasswordRegionThree }}',
+    "GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD" :  '{{ .Values.config.openStackSoEncryptedPassword}}',
     "GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE" : '{{ .Values.openStackTenantIdRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE" : '{{ .Values.openStackProjectNameRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE" : '{{ .Values.openStackDomainIdRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX" : '{{ .Values.openStackOamNetworkCidrPrefix }}',
-    "GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK" : 'public',
+    "GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK" : '{{ .Values.openStackPublicNetworkName }}',
+    "GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP": '{{ .Values.openStackSecurityGroup }}',
+    "GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID" : "{{ .Values.openStackPrivateSubnetId }}",
+    "GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR" : "{{ .Values.openStackPrivateNetCidr }}",
     "GLOBAL_INJECTED_POLICY_IP_ADDR" : 'pdp.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_POLICY_DROOLS_IP_ADDR" : 'drools.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_POLICY_API_IP_ADDR" : 'policy-api.{{include "common.namespace" .}}',
@@ -178,6 +194,8 @@
     "GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR" : 'policy-apex-pdp.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_PORTAL_IP_ADDR" : 'portal-app.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_PUBLIC_NET_ID" : '{{ .Values.openStackPublicNetId }}',
+    "GLOBAL_INJECTED_PRIVATE_KEY" : '{{ .Files.Get .Values.vnfPrivateKey }}',
+    "GLOBAL_INJECTED_PUBLIC_KEY" : '{{ .Values.vnfPubKey }}',
     "GLOBAL_INJECTED_REGION" : '{{ .Values.openStackRegion }}',
     "GLOBAL_INJECTED_SDC_BE_IP_ADDR" : 'sdc-be.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_SDC_BE_ONBOARD_IP_ADDR" : 'sdc-onboarding-be.{{include "common.namespace" .}}',
diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index 65da947..be75030 100644
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -22,7 +22,7 @@
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/testsuite:1.4.2
+image: onap/testsuite:1.5.0-STAGING-latest
 pullPolicy: Always
 
 ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
@@ -37,6 +37,7 @@
 
 # openStackEncryptedPasswordHere should match the encrypted string used in SO and APPC and overridden per environment
   openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
+  openStackSoEncryptedPassword: "SAME_STRING_AS_SO_JAVA_ENCRYPTED_PASSWORD"
 
 # Demo configuration
 # Nexus demo artifact version.  Maps to GLOBAL_INJECTED_ARTIFACTS_VERSION
@@ -45,24 +46,47 @@
 demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases"
 # Openstack medium sized flavour name.  Maps GLOBAL_INJECTED_VM_FLAVOR
 openStackFlavourMedium: "m1.medium"
+
+#################  Openstack .RC Parameters ################################333
+# KEYSTONE Version 3  Required for Rocky and beyond
+# Openstack Keystone API version. Valid values are [ v2.0, v3 ]. Maps to GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION
+openStackKeystoneAPIVersion: "v2.0"
+
+# OS_AUTH_URL without the /v3 or /v2.0 from the openstack .RC file
 # Openstack keystone URL.  Maps to GLOBAL_INJECTED_KEYSTONE
 openStackKeyStoneUrl: "http://1.2.3.4:5000"
+
+# OS_PROJECT_ID from the openstack .RC file
+# Openstack tenant UUID where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_TENANT_ID
+openStackTenantId: "47899782ed714295b1151681fdfd51f5"
+
+#  OS_PROJECT_NAME from the openstack .RC file
+# Project name of Openstack where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME
+openStackProjectName: "onap"
+
+# OS_USERNAME from the openstack .RC file
+# username for Openstack tenant where VNFs will be spawned.  Maps to GLOBAL_INJECTED_OPENSTACK_USERNAME
+openStackUserName: "tenantUsername"
+
+#  OS_PROJECT_DOMAIN_ID from the openstack .RC file
+#  in some environments it is a string but in other environmens it may be a numeric
+# Domain id of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID
+openStackDomainId: "default"
+
+#  OS_USER_DOMAIN from the openstack .RC file
+# Use Domain of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN
+openStackUserDomain:  "Default"
+
+
 # UUID of the Openstack network that can assign floating ips.  Maps to GLOBAL_INJECTED_PUBLIC_NET_ID
 openStackPublicNetId: "e8f51958045716781ffc"
+openStackPublicNetworkName: "public"
 # password for Openstack tenant where VNFs will be spawned.  Maps to GLOBAL_INJECTED_OPENSTACK_PASSWORD
 openStackPassword: "tenantPassword"
 # Openstack region.  Maps to GLOBAL_INJECTED_REGION
 openStackRegion: "RegionOne"
-# Openstack tenant UUID where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_TENANT_ID
-openStackTenantId: "47899782ed714295b1151681fdfd51f5"
-# username for Openstack tenant where VNFs will be spawned.  Maps to GLOBAL_INJECTED_OPENSTACK_USERNAME
-openStackUserName: "tenantUsername"
-# Project name of Openstack where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME
-openStackProjectName: "onap"
-# Domain id of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID
-openStackDomainId: "Default"
-# Openstack Keystone API version. Valid values are [ v2.0, v3 ]. Maps to GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION
-openStackKeystoneAPIVersion: "v2.0"
+
+
 # Values for second cloud instante for VNF instantiatioen testing and keystone v3
 openStackRegionRegionThree: "RegionThree"
 openStackKeyStoneUrlRegionThree: "http://1.2.3.4:5000"
@@ -98,7 +122,9 @@
 vidServerProtocol:  "http"
 vidServerPort:  "8080"
 # Override with Pub Key for access to VNF
-vnfPubKey: "FILL_IN_WITH_PUB_KEY"
+vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh imported-openssh-key"
+# Override with Private Key for access to VNF
+vnfPrivateKey: "onap_dev.yaml"
 # Override with DCAE VES Collector external IP
 dcaeCollectorIp: "FILL_IN_WITH_DCAE_VES_COLLECTOR_IP"
 
diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
index 46e2d5c..abcd09d 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-be/Chart.yaml b/kubernetes/sdc/charts/sdc-be/Chart.yaml
index fab2243..33852a3 100644
--- a/kubernetes/sdc/charts/sdc-be/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-be/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Backend API
 name: sdc-be
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-be/values.yaml b/kubernetes/sdc/charts/sdc-be/values.yaml
index 3363700..db724a4 100644
--- a/kubernetes/sdc/charts/sdc-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-be/values.yaml
@@ -28,8 +28,8 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdc-backend:1.4.1
-backendInitImage: onap/sdc-backend-init:1.4.1
+image: onap/sdc-backend:1.5-STAGING-latest
+backendInitImage: onap/sdc-backend-init:1.5-STAGING-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -93,3 +93,4 @@
       cpu: 20m
       memory: 2Gi
   unlimited: {}
+
diff --git a/kubernetes/sdc/charts/sdc-cs/Chart.yaml b/kubernetes/sdc/charts/sdc-cs/Chart.yaml
index 0537757..6d0df56 100644
--- a/kubernetes/sdc/charts/sdc-cs/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-cs/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Cassandra
 name: sdc-cs
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-cs/values.yaml b/kubernetes/sdc/charts/sdc-cs/values.yaml
index bf909ad..4d88747 100644
--- a/kubernetes/sdc/charts/sdc-cs/values.yaml
+++ b/kubernetes/sdc/charts/sdc-cs/values.yaml
@@ -28,8 +28,8 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdc-cassandra:1.4.1
-cassandraInitImage: onap/sdc-cassandra-init:1.4.1
+image: onap/sdc-cassandra:1.5-STAGING-latest
+cassandraInitImage: onap/sdc-cassandra-init:1.5-STAGING-latest
 
 pullPolicy: Always
 
diff --git a/kubernetes/sdc/charts/sdc-dcae-be/Chart.yaml b/kubernetes/sdc/charts/sdc-dcae-be/Chart.yaml
index 050a093..fcc2e68 100644
--- a/kubernetes/sdc/charts/sdc-dcae-be/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-be/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP SDC DCAE Backend client of TOSCALAB and SDC
 name: sdc-dcae-be
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-dcae-dt/Chart.yaml b/kubernetes/sdc/charts/sdc-dcae-dt/Chart.yaml
index 75f5b2b..1f3ee3b 100644
--- a/kubernetes/sdc/charts/sdc-dcae-dt/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-dt/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description:  ONAP DCAE desiner composition tool for creating customized templates
 name: sdc-dcae-dt
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-dcae-fe/Chart.yaml b/kubernetes/sdc/charts/sdc-dcae-fe/Chart.yaml
index 5679cde..2ce7ed3 100644
--- a/kubernetes/sdc/charts/sdc-dcae-fe/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-fe/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP SDC DCAE UI for service monitoring and MC create and configure
 name: sdc-dcae-fe
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-dcae-tosca-lab/Chart.yaml b/kubernetes/sdc/charts/sdc-dcae-tosca-lab/Chart.yaml
index e69503f..bdee850 100644
--- a/kubernetes/sdc/charts/sdc-dcae-tosca-lab/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-tosca-lab/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP Tosca model for component monitoring and descriptors deployment
 name: sdc-dcae-tosca-lab
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-es/Chart.yaml b/kubernetes/sdc/charts/sdc-es/Chart.yaml
index 7254f68..d1c46d0 100644
--- a/kubernetes/sdc/charts/sdc-es/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-es/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Elasticsearch
 name: sdc-es
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-es/values.yaml b/kubernetes/sdc/charts/sdc-es/values.yaml
index 25d75b7..c311a15 100644
--- a/kubernetes/sdc/charts/sdc-es/values.yaml
+++ b/kubernetes/sdc/charts/sdc-es/values.yaml
@@ -31,8 +31,8 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdc-elasticsearch:1.4.1
-elasticInitImage: onap/sdc-init-elasticsearch:1.4.1
+image: onap/sdc-elasticsearch:1.5-STAGING-latest
+elasticInitImage: onap/sdc-init-elasticsearch:1.5-STAGING-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdc/charts/sdc-fe/Chart.yaml b/kubernetes/sdc/charts/sdc-fe/Chart.yaml
index a249a5b..f171607 100644
--- a/kubernetes/sdc/charts/sdc-fe/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Front End
 name: sdc-fe
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-fe/values.yaml b/kubernetes/sdc/charts/sdc-fe/values.yaml
index 36607c7..8ec34fb 100644
--- a/kubernetes/sdc/charts/sdc-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/values.yaml
@@ -28,7 +28,7 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdc-frontend:1.4.1
+image: onap/sdc-frontend:1.5-STAGING-latest
 pullPolicy: Always
 
 config:
diff --git a/kubernetes/sdc/charts/sdc-kb/Chart.yaml b/kubernetes/sdc/charts/sdc-kb/Chart.yaml
index 3b87b1e..d6f0b32 100644
--- a/kubernetes/sdc/charts/sdc-kb/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-kb/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Kibana
 name: sdc-kb
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-kb/values.yaml b/kubernetes/sdc/charts/sdc-kb/values.yaml
index 64ab496..a6624bf 100644
--- a/kubernetes/sdc/charts/sdc-kb/values.yaml
+++ b/kubernetes/sdc/charts/sdc-kb/values.yaml
@@ -28,7 +28,7 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdc-kibana:1.4.1
+image: onap/sdc-kibana:1.5-STAGING-latest
 pullPolicy: Always
 
 config:
diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml
index 9f22430..9dae6d2 100644
--- a/kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Service Design and Creation Onboarding API
 name: sdc-onboarding-be
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
index 2a6918d..149566e 100644
--- a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
@@ -28,8 +28,8 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdc-onboard-backend:1.4.1
-onboardingInitImage: onap/sdc-onboard-cassandra-init:1.4.1
+image: onap/sdc-onboard-backend:1.5-STAGING-latest
+onboardingInitImage: onap/sdc-onboard-cassandra-init:1.5-STAGING-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml b/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml
index feac7ac..7ae97cf 100644
--- a/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml
+++ b/kubernetes/sdc/charts/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: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-wfd-be/values.yaml b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml
index 73eea4a..eb660e1 100644
--- a/kubernetes/sdc/charts/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml
@@ -28,8 +28,8 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/workflow-backend:1.4.1
-configInitImage: onap/workflow-init:1.4.1
+image: onap/workflow-backend:1.5.0-SNAPSHOT
+configInitImage: onap/workflow-init:1.5.0-SNAPSHOT
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml
index d5e6927..008e807 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml
+++ b/kubernetes/sdc/charts/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: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml
index d051eaf..e10de6d 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml
@@ -12,7 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+{{- define "rules.wf" -}}
+- http:
+    paths:
+      - path: /workflows/
+        backend:
+          serviceName: {{.Values.service.name}}
+          servicePort: {{.Values.service.internalPort}}
+{{- end -}}
+
 {{- if .Values.ingress.enabled }}
+
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -29,11 +39,21 @@
 {{- end }}
 spec:
   rules:
-  - http:
-      paths:
-      - path: /workflows/
-        backend:
-          serviceName: {{.Values.service.name}}
-          servicePort: {{.Values.service.internalPort}}
+{{- if .Values.ingress.hosts}}
+{{- range .Values.ingress.hosts}}
+{{- include "rules.wf" $ | nindent 2}}
+{{- if .}}
+    host: {{. | quote}}
+{{- end}}
+{{- end}}
+  tls:
+  - hosts:
+{{- range .Values.ingress.hosts}}
+{{- if .}}
+    - {{ . | quote }}
+{{- end}}
+{{- end }}
+{{- else}}
+{{- include "rules.wf" . | nindent 2}}
+{{- end}}
 {{ end }}
-
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
index d26c927..1b5d270 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
@@ -28,7 +28,7 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/workflow-frontend:1.4.1
+image: onap/workflow-frontend:1.5.0-SNAPSHOT
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -80,6 +80,7 @@
 
 ingress:
   enabled: false
+  hosts: ~
   annotations:
     ingress.kubernetes.io/secure-backends: "false"
     nginx.ingress.kubernetes.io/secure-backends: "false"
diff --git a/kubernetes/sdc/requirements.yaml b/kubernetes/sdc/requirements.yaml
index e966131..134205a 100644
--- a/kubernetes/sdc/requirements.yaml
+++ b/kubernetes/sdc/requirements.yaml
@@ -15,11 +15,11 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
 
   - name: cassandra
-    version: ~4.x-0
+    version: ~5.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/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 0c42d86..577eb96 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -97,7 +97,7 @@
             "commitlog_dir": "/var/lib/cassandra/commitlog",
             "socket_read_timeout": "20000",
             "socket_connect_timeout": "20000",
-            "titan_connection_timeout": "10000",
+            "janusgraph_connection_timeout": "10000",
             "replication_factor": "{{.Values.global.cassandra.replicaCount}}"
         }
     }
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index 7b04c64..e618e4f 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: SDN Controller
 name: sdnc
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml b/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml
index aceda60..f63b09e 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: SDNC DMaaP Listener
 name: dmaap-listener
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml b/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml
index 71fbbc5..79d7de4 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml
index de678bf..114a688 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: SDN-C Ansible Server
 name: sdnc-ansible-server
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml
index 1d30dfd..1063d17 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml b/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml
index 9efac5c..68d8b42 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: SDN-C Admin Portal
 name: sdnc-portal
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml b/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml
index 1d30dfd..1063d17 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/sdnc/charts/ueb-listener/Chart.yaml b/kubernetes/sdnc/charts/ueb-listener/Chart.yaml
index da6342c..fbac3ed 100644
--- a/kubernetes/sdnc/charts/ueb-listener/Chart.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: SDNC UEB Listener
 name: ueb-listener
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/sdnc/charts/ueb-listener/requirements.yaml b/kubernetes/sdnc/charts/ueb-listener/requirements.yaml
index 71fbbc5..79d7de4 100644
--- a/kubernetes/sdnc/charts/ueb-listener/requirements.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml
index a4bffc0..913fed1 100644
--- a/kubernetes/sdnc/requirements.yaml
+++ b/kubernetes/sdnc/requirements.yaml
@@ -14,24 +14,24 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: cds
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: cds.enabled
   - name: network-name-gen
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: dgbuilder
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: sdnc-prom
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: config.geoEnabled
   - name: mariadb-galera
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: config.localDBCluster
 
diff --git a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
index 2a733de..455cb83 100644
--- a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
+++ b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
@@ -22,37 +22,49 @@
 ###
 
 SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
-MYSQL_HOST=${MYSQL_HOST:-{{.Values.config.mariadbGalera.serviceName}}.{{.Release.Namespace}}}
-MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}}
+ETC_DIR=${ETC_DIR:-${SDNC_HOME}/data}
+BIN_DIR=${BIN_DIR-${SDNC_HOME}/bin}
+MYSQL_HOST=${MYSQL_HOST:-dbhost}
+MYSQL_PASSWORD=${MYSQL_PASSWORD:-openECOMP1.0}
 
 SDNC_DB_USER=${SDNC_DB_USER:-sdnctl}
-SDNC_DB_PASSWD=${SDNC_DB_PASSWD:-gamma}
+SDNC_DB_PASSWORD=${SDNC_DB_PASSWORD:-gamma}
 SDNC_DB_DATABASE=${SDN_DB_DATABASE:-sdnctl}
 
 
 # Create tablespace and user account
-mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} mysql <<-END
-CREATE DATABASE ${SDNC_DB_DATABASE};
-CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWD}';
-CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWD}';
+mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} mysql <<-END
+CREATE DATABASE IF NOT EXISTS ${SDNC_DB_DATABASE};
+CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWORD}';
+CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWORD}';
 GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'localhost' WITH GRANT OPTION;
 GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'%' WITH GRANT OPTION;
+flush privileges;
 commit;
 END
 
 # load schema
-if [ -f ${SDNC_HOME}/data/sdnctl.dump ]
+if [ -f ${ETC_DIR}/sdnctl.dump ]
 then
-  mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} sdnctl < ${SDNC_HOME}/data/sdnctl.dump
+  mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} sdnctl < ${ETC_DIR}/sdnctl.dump
 fi
 
-for datafile in ${SDNC_HOME}/data/*.data.dump
+for datafile in ${ETC_DIR}/*.data.dump
 do
-  mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} sdnctl < $datafile
+  mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} sdnctl < $datafile
 done
 
 # Create VNIs 100-199
-${SDNC_HOME}/bin/addVnis.sh 100 199
+${BIN_DIR}/addVnis.sh 100 199
 
 # Drop FK_NETWORK_MODEL foreign key as workaround for SDNC-291.
-${SDNC_HOME}/bin/rmForeignKey.sh NETWORK_MODEL FK_NETWORK_MODEL
+${BIN_DIR}/rmForeignKey.sh NETWORK_MODEL FK_NETWORK_MODEL
+
+if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
+then
+    echo "Installing directed graphs"
+     ${SDNC_HOME}/svclogic/bin/install.sh
+fi
+
+
+exit 0
diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh
index eb49a69..5586ebb 100755
--- a/kubernetes/sdnc/resources/config/bin/startODL.sh
+++ b/kubernetes/sdnc/resources/config/bin/startODL.sh
@@ -118,12 +118,8 @@
 SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
 SDNC_BIN=${SDNC_BIN:-/opt/onap/sdnc/bin}
 CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
-SLEEP_TIME=${SLEEP_TIME:-120}
-MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}}
-MYSQL_HOST=${MYSQL_HOST:-{{.Values.config.dbServiceName}}.{{.Release.Namespace}}}
 ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
 GEO_ENABLED=${GEO_ENABLED:-false}
-DBINIT_DIR=${DBINIT_DIR:-/opt/opendaylight/current/daexim}
 SDNRWT=${SDNRWT:-false}
 SDNRWT_BOOTFEATURES=${SDNRWT_BOOTFEATURES:-sdnr-wt-feature-aggregator}
 export ODL_ADMIN_PASSWORD ODL_ADMIN_USERNAME
@@ -133,44 +129,13 @@
 echo "  SDNC_REPLICAS=$SDNC_REPLICAS"
 echo "  SDNRWT=$SDNRWT"
 
-#
-# Wait for database to init properly
-#
-echo "Waiting for mysql"
-until mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} mysql &> /dev/null
-do
-  printf "."
-  sleep 1
-done
-echo -e "\nmysql ready"
 
-if [ ! -d ${DBINIT_DIR} ]
-then
-    mkdir -p ${DBINIT_DIR}
-fi
-
-if [ ! -f ${DBINIT_DIR}/.installed ]
-then
-        echo "Installing SDNC database"
-        ${SDNC_HOME}/bin/installSdncDb.sh
-
-        if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
-        then
-                echo "Installing directed graphs"
-                ${SDNC_HOME}/svclogic/bin/install.sh
-        fi
-
-        echo "Installed at `date`" > ${DBINIT_DIR}/.installed
-fi
 
 if [ ! -f ${SDNC_HOME}/.installed ]
 then
 	echo "Installing SDN-C keyStore"
 	${SDNC_HOME}/bin/addSdncKeyStore.sh
 
-	# No longer needed (this was a workaround for bug in Nitrogen)
-	#${CCSDK_HOME}/bin/installOdlHostKey.sh
-
 	if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
 
 	if $SDNRWT ; then install_sdnrwt_features ; fi
diff --git a/kubernetes/sdnc/sdnc-prom/Chart.yaml b/kubernetes/sdnc/sdnc-prom/Chart.yaml
index 4344db0..f0363e8 100644
--- a/kubernetes/sdnc/sdnc-prom/Chart.yaml
+++ b/kubernetes/sdnc/sdnc-prom/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP SDNC Policy Driven Ownership Management
 name: sdnc-prom
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sdnc/sdnc-prom/requirements.yaml b/kubernetes/sdnc/sdnc-prom/requirements.yaml
index 509eadd..a12911b 100644
--- a/kubernetes/sdnc/sdnc-prom/requirements.yaml
+++ b/kubernetes/sdnc/sdnc-prom/requirements.yaml
@@ -14,5 +14,5 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml
new file mode 100755
index 0000000..9e79ebe
--- /dev/null
+++ b/kubernetes/sdnc/templates/job.yaml
@@ -0,0 +1,129 @@
+# Copyright © 2017 Amdocs, Bell Canada, AT&T
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "common.fullname" . }}-dbinit-job
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    "helm.sh/hook": post-install
+    "helm.sh/hook-weight": "0"
+    "helm.sh/hook-delete-policy": before-hook-creation
+spec:
+  backoffLimit: 20
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.name" . }}-job
+        release: {{ .Release.Name }}
+      name: {{ include "common.name" . }}
+    spec:
+      initContainers:
+      - name: {{ include "common.name" . }}-readiness
+        command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - {{ .Values.config.mariadbGalera.chartName }}
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+      containers:
+      - name: {{ include "common.name" . }}
+        image: "{{.Values.image}}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        env:
+          - name: MYSQL_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: {{ template "common.fullname" . }}
+                key: db-root-password
+          - name: ODL_ADMIN_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: {{ template "common.fullname" . }}-odl
+                key: odl-password
+          - name: SDNC_DB_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: {{ template "common.fullname" . }}-sdnctl
+                key: db-sdnctl-password
+          - name: MYSQL_HOST
+            value: "{{.Values.config.mariadbGalera.serviceName}}.{{.Release.Namespace}}"
+          - name: SDNC_HOME
+            value: "{{.Values.config.sdncHome}}"
+          - name: ETC_DIR
+            value: "{{.Values.config.etcDir}}"
+          - name: BIN_DIR
+            value: "{{.Values.config.binDir}}"
+          - name: SDNC_DB_USER
+            value: "{{.Values.config.dbSdnctlUser}}"
+          - name: SDNC_DB_DATABASE
+            value: "{{.Values.config.dbSdnctlDatabase}}"
+        volumeMounts:
+          - mountPath: {{ .Values.config.binDir }}/installSdncDb.sh
+            name: bin
+            subPath: installSdncDb.sh
+          - mountPath: {{ .Values.config.configDir }}/svclogic.properties
+            name: properties
+            subPath: svclogic.properties
+          - mountPath: /opt/onap/sdnc/svclogic/config/svclogic.properties
+            name: properties
+            subPath: svclogic.properties
+          - mountPath: {{ .Values.config.configDir }}/dblib.properties
+            name: properties
+            subPath: dblib.properties
+        command:
+          - /bin/bash
+        args:
+          - {{.Values.config.binDir }}/installSdncDb.sh
+        resources:
+{{ include "common.resources" . | indent 12 }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 10 }}
+      {{- end -}}
+      {{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 10 }}
+      {{- end }}
+      volumes:
+      - name: localtime
+        hostPath:
+          path: /etc/localtime
+      - name: docker-entrypoint-initdb-d
+        emptyDir: {}
+      - name: bin
+        configMap:
+          name: {{ include "common.fullname" . }}-bin
+          defaultMode: 0755
+      - name: properties
+        configMap:
+          name: {{ include "common.fullname" . }}-properties
+          defaultMode: 0644
+      restartPolicy: Never
+      imagePullSecrets:
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 9bd50a1..dcf6938 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -34,6 +34,7 @@
 pullPolicy: Always
 image: onap/sdnc-image:1.5.4
 
+
 # flag to enable debugging - application support required
 debugEnabled: false
 
@@ -43,9 +44,13 @@
   odlGid: 101
   odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
   dbRootPassword: secretpassword
+  dbSdnctlUser: sdnctl
+  dbSdnctlDatabase: sdnctl
   dbSdnctlPassword: gamma
   enableClustering: true
+  sdncHome: /opt/onap/sdnc
   binDir: /opt/onap/sdnc/bin
+  etcDir: /opt/onap/sdnc/data
   geoEnabled: false
 # if geoEnabled is set to true here, mysql.geoEnabled must be set to true
 # if geoEnabled is set to true the following 3 values must be set to their proper values
diff --git a/kubernetes/sniro-emulator/Chart.yaml b/kubernetes/sniro-emulator/Chart.yaml
index 1f88ff5..bc278bd 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/sniro-emulator/requirements.yaml b/kubernetes/sniro-emulator/requirements.yaml
index 9996777..6a748be 100644
--- a/kubernetes/sniro-emulator/requirements.yaml
+++ b/kubernetes/sniro-emulator/requirements.yaml
@@ -14,7 +14,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/so/Chart.yaml b/kubernetes/so/Chart.yaml
index 2c96502..7289a69 100755
--- a/kubernetes/so/Chart.yaml
+++ b/kubernetes/so/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP Service Orchestrator
 name: so
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/so/charts/so-bpmn-infra/Chart.yaml b/kubernetes/so/charts/so-bpmn-infra/Chart.yaml
index cbf3b83..4e4d565 100755
--- a/kubernetes/so/charts/so-bpmn-infra/Chart.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/Chart.yaml
@@ -15,4 +15,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-bpmn-infra
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
index 2c8d865..35b86a3 100755
--- a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -48,6 +48,9 @@
 msb-ip: msb-iag.{{ include "common.namespace" . }}
 msb-port: 80
 mso:
+  rainyDay:
+    retryDurationMultiplier: 2
+    maxRetries: 5
   msoKey: 07a7159d3bf51a0e53be7a8f89699be7
   correlation:
     timeout: 60
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/charts/so-catalog-db-adapter/Chart.yaml
index 14d42be..a06c8f9 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/Chart.yaml
+++ b/kubernetes/so/charts/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: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/so/charts/so-db-secrets/Chart.yaml b/kubernetes/so/charts/so-db-secrets/Chart.yaml
index 9dccc64..4af691a 100755
--- a/kubernetes/so/charts/so-db-secrets/Chart.yaml
+++ b/kubernetes/so/charts/so-db-secrets/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: A Helm chart for DB secrets
 name: so-db-secrets
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/so/charts/so-mariadb/Chart.yaml b/kubernetes/so/charts/so-mariadb/Chart.yaml
index 5e14c56..b22a465 100755
--- a/kubernetes/so/charts/so-mariadb/Chart.yaml
+++ b/kubernetes/so/charts/so-mariadb/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: MariaDB Service
 name: so-mariadb
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/so/charts/so-monitoring/Chart.yaml b/kubernetes/so/charts/so-monitoring/Chart.yaml
index 0ace01d..496eacb 100644
--- a/kubernetes/so/charts/so-monitoring/Chart.yaml
+++ b/kubernetes/so/charts/so-monitoring/Chart.yaml
@@ -19,4 +19,4 @@
 apiVersion: v1
 description: A Helm chart for ONAP Service Orchestration Monitoring
 name: so-monitoring
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
index c2e6ad0..dd649c1 100644
--- a/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
@@ -15,3 +15,11 @@
       api:
         url: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/infraActiveRequests/
         auth: Basic YnBlbDpwYXNzd29yZDEk
+
+spring:
+  security:
+    usercredentials:
+    -
+      username: gui
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: GUI-Client
diff --git a/kubernetes/so/charts/so-openstack-adapter/Chart.yaml b/kubernetes/so/charts/so-openstack-adapter/Chart.yaml
index 9e9d180..b4a955b 100755
--- a/kubernetes/so/charts/so-openstack-adapter/Chart.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/Chart.yaml
@@ -15,4 +15,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-openstack-adapter
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/so/charts/so-request-db-adapter/Chart.yaml b/kubernetes/so/charts/so-request-db-adapter/Chart.yaml
index 0d547b1..74d9894 100755
--- a/kubernetes/so/charts/so-request-db-adapter/Chart.yaml
+++ b/kubernetes/so/charts/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: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/so/charts/so-sdc-controller/Chart.yaml b/kubernetes/so/charts/so-sdc-controller/Chart.yaml
index 5d4b5cc..23b95f5 100755
--- a/kubernetes/so/charts/so-sdc-controller/Chart.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/Chart.yaml
@@ -15,4 +15,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-sdc-controller
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/so/charts/so-sdnc-adapter/Chart.yaml b/kubernetes/so/charts/so-sdnc-adapter/Chart.yaml
index 747e2ad..04ee1df 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/Chart.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/Chart.yaml
@@ -15,4 +15,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-sdnc-adapter
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/so/charts/so-vfc-adapter/Chart.yaml b/kubernetes/so/charts/so-vfc-adapter/Chart.yaml
index a218b11..6eb1ddf 100755
--- a/kubernetes/so/charts/so-vfc-adapter/Chart.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/Chart.yaml
@@ -15,4 +15,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-vfc-adapter
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/so/charts/so-vnfm-adapter/Chart.yaml b/kubernetes/so/charts/so-vnfm-adapter/Chart.yaml
index 80eda87..3d99120 100755
--- a/kubernetes/so/charts/so-vnfm-adapter/Chart.yaml
+++ b/kubernetes/so/charts/so-vnfm-adapter/Chart.yaml
@@ -14,4 +14,4 @@
 apiVersion: v1
 description: ONAP SO VNFM Adapter
 name: so-vnfm-adapter
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/so/requirements.yaml b/kubernetes/so/requirements.yaml
index 237486d..7ef398f 100755
--- a/kubernetes/so/requirements.yaml
+++ b/kubernetes/so/requirements.yaml
@@ -13,12 +13,12 @@
 # limitations under the License.
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
     condition: global.mariadbGalera.localCluster
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml
index 0327cd8..0a49229 100644
--- a/kubernetes/uui/Chart.yaml
+++ b/kubernetes/uui/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP uui
 name: uui
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/uui/charts/uui-server/Chart.yaml b/kubernetes/uui/charts/uui-server/Chart.yaml
index b665476..360323f 100644
--- a/kubernetes/uui/charts/uui-server/Chart.yaml
+++ b/kubernetes/uui/charts/uui-server/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP uui server
 name: uui-server
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/uui/requirements.yaml b/kubernetes/uui/requirements.yaml
index 3ee610f..537ede6 100644
--- a/kubernetes/uui/requirements.yaml
+++ b/kubernetes/uui/requirements.yaml
@@ -14,7 +14,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/vfc/Chart.yaml b/kubernetes/vfc/Chart.yaml
index 03c5b95..bed76cb 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/vfc/charts/vfc-catalog/Chart.yaml b/kubernetes/vfc/charts/vfc-catalog/Chart.yaml
index f04a7fa..2b52834 100644
--- a/kubernetes/vfc/charts/vfc-catalog/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-catalog/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - Catalog
 name: vfc-catalog
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml
index 214d3bb..ef4d9a5 100644
--- a/kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-ems-driver/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - EMS Driver
 name: vfc-ems-driver
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml
index 96d008c..b09e73a 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - Generic VNFM Driver
 name: vfc-generic-vnfm-driver
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml
index 61aaf32..d40ad58 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - Huawei VNFM Driver
 name: vfc-huawei-vnfm-driver
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml
index d3234ee..c92c9e1 100644
--- a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - Juju VNFM Driver
 name: vfc-juju-vnfm-driver
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml b/kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml
index 94de876..fffb9f6 100644
--- a/kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-multivim-proxy/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - MultiVIM Proxy
 name: vfc-multivim-proxy
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml
index 25414c4..3178a5f 100644
--- a/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-nokia-v2vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - Nokia V2VNFM Driver
 name: vfc-nokia-v2vnfm-driver
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml b/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml
index d417e87..3e1ca38 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - NS Life Cycle Management
 name: vfc-nslcm
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-redis/Chart.yaml b/kubernetes/vfc/charts/vfc-redis/Chart.yaml
index 90ffba9..6955e70 100644
--- a/kubernetes/vfc/charts/vfc-redis/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-redis/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - DB
 name: vfc-redis
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/vfc/charts/vfc-resmgr/Chart.yaml b/kubernetes/vfc/charts/vfc-resmgr/Chart.yaml
index c883cac..13ec6f8 100644
--- a/kubernetes/vfc/charts/vfc-resmgr/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-resmgr/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - Resource Manager
 name: vfc-resmgr
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml b/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml
index 67c2164..541c759 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - VNF Life Cycle Management
 name: vfc-vnflcm
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml b/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml
index 362715f..6460a2f 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - VNF Manager
 name: vfc-vnfmgr
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml b/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml
index 1251506..8fab2ce 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - VNF Resource Manager
 name: vfc-vnfres
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml b/kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml
index 591a995..9705919 100644
--- a/kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-workflow-engine/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - Workflow Engine
 name: vfc-workflow-engine
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-workflow/Chart.yaml b/kubernetes/vfc/charts/vfc-workflow/Chart.yaml
index ccf00f8..78a7c46 100644
--- a/kubernetes/vfc/charts/vfc-workflow/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-workflow/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - Workflow
 name: vfc-workflow
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml
index 36eb8dc..3b55435 100644
--- a/kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-zte-sdnc-driver/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - ZTE SDNC Driver
 name: vfc-zte-sdnc-driver
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml
index 4ac2046..e3ffd72 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VFC - ZTE VNFM Driver
 name: vfc-zte-vnfm-driver
-version: 4.0.0
\ No newline at end of file
+version: 5.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/requirements.yaml b/kubernetes/vfc/requirements.yaml
index 71bfc00..c2c445c 100644
--- a/kubernetes/vfc/requirements.yaml
+++ b/kubernetes/vfc/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: mariadb-galera
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/vid/Chart.yaml b/kubernetes/vid/Chart.yaml
index deb0fc6..e4aa089 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: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/vid/charts/vid-mariadb-galera/Chart.yaml b/kubernetes/vid/charts/vid-mariadb-galera/Chart.yaml
index dd00351..0419147 100644
--- a/kubernetes/vid/charts/vid-mariadb-galera/Chart.yaml
+++ b/kubernetes/vid/charts/vid-mariadb-galera/Chart.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 description: ONAP VID MariaDB Galera cluster
 name: vid_mariadb_galera
-version: 4.0.0
+version: 5.0.0
 keywords:
   - mariadb
   - mysql
diff --git a/kubernetes/vid/requirements.yaml b/kubernetes/vid/requirements.yaml
index 9996777..6a748be 100644
--- a/kubernetes/vid/requirements.yaml
+++ b/kubernetes/vid/requirements.yaml
@@ -14,7 +14,7 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.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/vnfsdk/Chart.yaml b/kubernetes/vnfsdk/Chart.yaml
index f8c4933..2a6b5c8 100644
--- a/kubernetes/vnfsdk/Chart.yaml
+++ b/kubernetes/vnfsdk/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP VNF SDK
 name: vnfsdk
-version: 4.0.0
+version: 5.0.0
diff --git a/kubernetes/vnfsdk/requirements.yaml b/kubernetes/vnfsdk/requirements.yaml
index fc43cb2..7b1f490 100644
--- a/kubernetes/vnfsdk/requirements.yaml
+++ b/kubernetes/vnfsdk/requirements.yaml
@@ -14,8 +14,8 @@
 
 dependencies:
   - name: common
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
   - name: postgres
-    version: ~4.x-0
+    version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/vnfsdk/templates/service.yaml b/kubernetes/vnfsdk/templates/service.yaml
index f6208cf..c683d4c 100644
--- a/kubernetes/vnfsdk/templates/service.yaml
+++ b/kubernetes/vnfsdk/templates/service.yaml
@@ -27,7 +27,7 @@
   ports:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.internalPort }}
-      nodePort: {{ .Values.global.nodePortPrefix | default "302" }}{{ .Values.service.nodePort }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}