diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/values.yaml b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/values.yaml
index 7cd5938..c3e4e08 100644
--- a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/values.yaml
@@ -28,7 +28,7 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/smsquorumclient:3.0.1
+image: onap/aaf/smsquorumclient:4.0.0-SNAPSHOT-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/aaf/charts/aaf-sms/values.yaml b/kubernetes/aaf/charts/aaf-sms/values.yaml
index 28b46c2..c8fd6fd 100644
--- a/kubernetes/aaf/charts/aaf-sms/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/values.yaml
@@ -28,7 +28,7 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/sms:3.0.1
+image: onap/aaf/sms:4.0.0-SNAPSHOT-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml
index bf64c6d..c374074 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml
@@ -21,7 +21,7 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/abrmd:3.0.0
+image: onap/aaf/abrmd:4.0.0-SNAPSHOT-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml
index 3993cfc..2d874ba 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml
@@ -23,7 +23,7 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/distcenter:3.0.0
+image: onap/aaf/distcenter:4.0.0-SNAPSHOT-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml
index 3fd53d2..2c41f58 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml
@@ -23,7 +23,7 @@
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/testcaservice:3.0.0
+image: onap/aaf/testcaservice:4.0.0-SNAPSHOT-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/aaf/charts/aaf-sshsm/values.yaml b/kubernetes/aaf/charts/aaf-sshsm/values.yaml
index d068846..2d20d57 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/values.yaml
@@ -62,4 +62,4 @@
     requests:
       cpu: 10m
       memory: 100Mi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}
diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index e07f346..1ddb604 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -29,7 +29,7 @@
   # repository: "nexus3.onap.org:10003"
 
   aaf:
-    imageVersion: 2.1.12-SNAPSHOT
+    imageVersion: 2.1.13
     #imageVersion: latest
     readiness: false
     aaf_env: "DEV"
diff --git a/kubernetes/aai b/kubernetes/aai
index dbd0483..459205f 160000
--- a/kubernetes/aai
+++ b/kubernetes/aai
@@ -1 +1 @@
-Subproject commit dbd0483dce3b68687b2df8f218780ec75242d9f8
+Subproject commit 459205f75a77711479daad529aa97e0de8d67b18
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/logback.xml b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/logback.xml
index 2a5c5ce..349336e 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/logback.xml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/logback.xml
@@ -30,7 +30,6 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework" level="info"/>
     <logger name="org.springframework.web" level="info"/>
     <logger name="org.springframework.security.web.authentication" level="warn"/>
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
index 67281dd..2d96021 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
@@ -82,7 +82,6 @@
 
 
 persistence:
-  enabled: true
   volumeReclaimPolicy: Retain
   accessMode: ReadWriteMany
   size: 2Gi
diff --git a/kubernetes/cds/charts/cds-controller-blueprints/resources/config/logback.xml b/kubernetes/cds/charts/cds-controller-blueprints/resources/config/logback.xml
index e965e2f..2438358 100644
--- a/kubernetes/cds/charts/cds-controller-blueprints/resources/config/logback.xml
+++ b/kubernetes/cds/charts/cds-controller-blueprints/resources/config/logback.xml
@@ -30,7 +30,6 @@
         </encoder>
     </appender>
 
-
     <logger name="org.springframework" level="info"/>
     <logger name="org.springframework.web" level="info"/>
     <logger name="org.springframework.security.web.authentication" level="warn"/>
diff --git a/kubernetes/vfc/charts/vfc-db/Chart.yaml b/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml
old mode 100644
new mode 100755
similarity index 84%
copy from kubernetes/vfc/charts/vfc-db/Chart.yaml
copy to kubernetes/cds/charts/cds-sdc-listener/Chart.yaml
index 64e6c29..4385de1
--- a/kubernetes/vfc/charts/vfc-db/Chart.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 Verizon. All Rights Reserved.
+# Copyright (c) 2019 Bell Canada
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 apiVersion: v1
-description: ONAP VFC - DB
-name: vfc-db
-version: 4.0.0
+description: ONAP CDS SDC listener microservice
+name: cds-sdc-listener
+version: 4.0.0
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-db/Chart.yaml b/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml
old mode 100644
new mode 100755
similarity index 81%
copy from kubernetes/vfc/charts/vfc-db/Chart.yaml
copy to kubernetes/cds/charts/cds-sdc-listener/requirements.yaml
index 64e6c29..a57d2b6
--- a/kubernetes/vfc/charts/vfc-db/Chart.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 Verizon. All Rights Reserved.
+# Copyright (c) 2019 Bell Canada
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-description: ONAP VFC - DB
-name: vfc-db
-version: 4.0.0
+dependencies:
+  - name: common
+    version: ~4.x-0
+    repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-sdc-listener/resources/config/application.yaml b/kubernetes/cds/charts/cds-sdc-listener/resources/config/application.yaml
new file mode 100644
index 0000000..c02eac2
--- /dev/null
+++ b/kubernetes/cds/charts/cds-sdc-listener/resources/config/application.yaml
@@ -0,0 +1,20 @@
+listenerservice:
+  config:
+    asdcAddress: sdc-be:8443 #SDC-BE
+    messageBusAddress: message-router #Message-Router
+    user: vid #SDC-username
+    password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U #SDC-password
+    pollingInterval: 15
+    pollingTimeout: 60
+    relevantArtifactTypes: TOSCA_CSAR
+    consumerGroup: cds
+    environmentName: AUTO
+    consumerId: cds
+    keyStorePassword:
+    keyStorePath:
+    activateServerTLSAuth : false
+    isUseHttpsWithDmaap: false
+    archivePath: /opt/app/onap/sdc-listener/
+    grpcAddress: cds-blueprints-processor
+    grpcPort: 9111
+    authHeader: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-sdc-listener/resources/config/logback.xml b/kubernetes/cds/charts/cds-sdc-listener/resources/config/logback.xml
new file mode 100644
index 0000000..5715226
--- /dev/null
+++ b/kubernetes/cds/charts/cds-sdc-listener/resources/config/logback.xml
@@ -0,0 +1,43 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<configuration>
+
+  <property name="localPattern" value="%d{HH:mm:ss.SSS} %-5level %logger{100} - %msg%n" />
+
+  <property name="defaultPattern" value="%date{ISO8601,UTC}|%X{RequestID}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
+
+  <property name="debugLoggerPattern" value="%date{ISO8601,UTC}|%X{RequestID}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}|[%caller{3}]| %msg%n" />
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>${defaultPattern}</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.springframework" level="info"/>
+  <logger name="org.springframework.web" level="info"/>
+  <logger name="org.springframework.security.web.authentication" level="warn"/>
+  <logger name="org.hibernate" level="error"/>
+  <logger name="org.onap.ccsdk.cds" level="info"/>
+
+  <root level="warn">
+    <appender-ref ref="STDOUT"/>
+  </root>
+
+</configuration>
\ No newline at end of file
diff --git a/kubernetes/vfc/charts/vfc-db/Chart.yaml b/kubernetes/cds/charts/cds-sdc-listener/templates/configmap.yaml
similarity index 70%
copy from kubernetes/vfc/charts/vfc-db/Chart.yaml
copy to kubernetes/cds/charts/cds-sdc-listener/templates/configmap.yaml
index 64e6c29..e82ac6f 100644
--- a/kubernetes/vfc/charts/vfc-db/Chart.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/templates/configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 Verizon. All Rights Reserved.
+# Copyright (c) 2019 Bell Canada
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,6 +13,9 @@
 # limitations under the License.
 
 apiVersion: v1
-description: ONAP VFC - DB
-name: vfc-db
-version: 4.0.0
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-configmap
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-sdc-listener/templates/deployment.yaml b/kubernetes/cds/charts/cds-sdc-listener/templates/deployment.yaml
new file mode 100644
index 0000000..0dfc68b
--- /dev/null
+++ b/kubernetes/cds/charts/cds-sdc-listener/templates/deployment.yaml
@@ -0,0 +1,102 @@
+# Copyright (c) 2019 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.
+
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: {{ include "common.fullname" . }}
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      initContainers:
+        - command:
+          - /root/ready.py
+          args:
+            - --container-name
+            - sdc-be
+            - --container-name
+            - message-router
+            - --container-name
+            - cds-blueprints-processor
+          env:
+          - name: NAMESPACE
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.namespace
+          image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          name: {{ include "common.name" . }}-readiness
+      containers:
+        - name: {{ include "common.name" . }}
+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          env:
+          - name: APP_CONFIG_HOME
+            value: {{ .Values.config.appConfigDir }}
+          ports:
+          - containerPort: {{ .Values.service.http.internalPort }}
+          {{ if .Values.liveness.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /api/v1/sdclistener/healthcheck
+              port: {{ .Values.service.http.internalPort }}
+            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.liveness.periodSeconds }}
+          {{end}}
+          readinessProbe:
+            httpGet:
+              path: /api/v1/sdclistener/healthcheck
+              port: {{ .Values.service.http.internalPort }}
+            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readiness.periodSeconds }}
+          volumeMounts:
+          - mountPath: {{ .Values.config.appConfigDir }}/application.yaml
+            name: {{ include "common.fullname" . }}-config
+            subPath: application.yaml
+          - mountPath: {{ .Values.config.appConfigDir }}/logback.xml
+            name: {{ include "common.fullname" . }}-config
+            subPath: logback.xml
+          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: {{ include "common.fullname" . }}-config
+          configMap:
+            name: {{ include "common.fullname" . }}-configmap
+            items:
+            - key: application.yaml
+              path: application.yaml
+            - key: logback.xml
+              path: logback.xml
+      imagePullSecrets:
+      - name: {{ include "common.namespace" . }}-docker-registry-key
\ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-sdc-listener/templates/service.yaml b/kubernetes/cds/charts/cds-sdc-listener/templates/service.yaml
new file mode 100644
index 0000000..82a6175
--- /dev/null
+++ b/kubernetes/cds/charts/cds-sdc-listener/templates/service.yaml
@@ -0,0 +1,35 @@
+# Copyright (c) 2019 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.
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.servicename" . }}
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.http.externalPort }}
+      targetPort: {{ .Values.service.http.internalPort }}
+      {{- if eq .Values.service.type "NodePort"}}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+      {{- end}}
+      name: {{ .Values.service.http.portName | default "http" }}
+  selector:
+    app: {{ include "common.name" . }}
+    release: {{ .Release.Name }}
diff --git a/kubernetes/cds/charts/cds-sdc-listener/values.yaml b/kubernetes/cds/charts/cds-sdc-listener/values.yaml
new file mode 100644
index 0000000..7e1c4c5
--- /dev/null
+++ b/kubernetes/cds/charts/cds-sdc-listener/values.yaml
@@ -0,0 +1,100 @@
+# Copyright (c) 2019 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.
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+  # Change to an unused port prefix range to prevent port conflicts
+  # with other instances running within the same k8s cluster
+  nodePortPrefix: 302
+
+  # image repositories
+  repository: nexus3.onap.org:10001
+
+  # readiness check
+  readinessRepository: oomk8s
+  readinessImage: readiness-check:2.0.0
+
+  # image pull policy
+  pullPolicy: Always
+
+  persistence:
+    mountPath: /dockerdata-nfs
+
+#################################################################
+# Application configuration defaults.
+#################################################################
+# application image
+repository: nexus3.onap.org:10001
+image: onap/ccsdk-sdclistener:0.4.2
+name: sdc-listener
+pullPolicy: Always
+
+# flag to enable debugging - application support required
+debugEnabled: false
+
+# application configuration
+config:
+  appConfigDir: /opt/app/onap/config
+
+# default number of instances
+replicaCount: 1
+
+nodeSelector: {}
+
+affinity: {}
+
+# probe configuration parameters
+liveness:
+  initialDelaySeconds: 10
+  periodSeconds: 10
+  # necessary to disable liveness probe when setting breakpoints
+  # in debugger so K8s doesn't restart unresponsive container
+  enabled: true
+
+readiness:
+  initialDelaySeconds: 10
+  periodSeconds: 10
+
+service:
+  type: ClusterIP
+  http:
+    portName: cds-sdc-listener-http
+    internalPort: 8080
+    externalPort: 8080
+
+persistence:
+  enabled: true
+
+ingress:
+  enabled: false
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  #
+  # Example:
+  # Configure resource requests and limits
+  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
+  # Minimum memory for development is 2 CPU cores and 4GB memory
+# Minimum memory for production is 4 CPU cores and 8GB memory
+#resources:
+#  limits:
+#    cpu: 2
+#    memory: 4Gi
+#  requests:
+#    cpu: 2
+#    memory: 4Gi
diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 31b8643..8b76f64 100755
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -41,6 +41,10 @@
 	echo "       demo-k8s.sh <namespace> instantiateVFW"
 	echo "               - Instantiate vFW module for the demo customer (DemoCust<uuid>)"
 	echo " "
+	echo "       demo-k8s.sh <namespace> instantiateVFWdirectso  csar_filename"
+	echo "               - Instantiate vFW module using direct SO interface using previously distributed model "
+        echo "                 that is in /tmp/csar in robot container"
+	echo " "
 	echo "       demo-k8s.sh <namespace> deleteVNF <module_name from instantiateVFW>"
 	echo "               - Delete the module created by instantiateVFW"
 	echo " "
@@ -134,6 +138,16 @@
 			VARIABLES="$VARIABLES -v GLOBAL_BUILD_NUMBER:$$"
 			shift
 			;;
+        instantiateVFWdirectso)
+                        TAG="instantiateVFWdirectso"
+                        shift
+                        if [ $# -ne 1 ];then
+                                        echo "Usage: demo-k8s.sh <namespace> instantiateVFWdirectso <csar_filename>"
+                                        exit
+                                fi
+                        VARIABLES="$VARIABLES -v CSAR_FILE:$1 -v GLOBAL_BUILD_NUMBER:$$"
+                        shift
+                        ;;
     	deleteVNF)
 			TAG="deleteVNF"
 			shift
diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh
index aaa3bc8..a59e3b6 100755
--- a/kubernetes/robot/ete-k8s.sh
+++ b/kubernetes/robot/ete-k8s.sh
@@ -21,6 +21,39 @@
 #
 if [ "$1" == "" ] || [ "$2" == "" ]; then
    echo "Usage: ete-k8s.sh [namespace] [ health | healthdist | distribute | instantiate | instantiateVFWCL | instantiateDemoVFWCL |  | portal ]"
+   echo ""
+   echo "  List of test case tags (filename for intent: tag) "
+   echo " "
+   echo "  cds.robot: cds "
+   echo " "
+   echo "  clamp.robot: clamp "
+   echo " "
+   echo "  demo.robot: InitDemo, InitCustomer , APPCCDTPreloadDemo, APPCMountPointDemo, DistributeDemoVFWDT, DistributeVFWNG,  "
+   echo "              InitDistribution, PreloadDemo, deleteVNF, heatbridge, instantiateDemoVFWCL, instantiateVFW, instantiateVFWCL, instantiateVFWDT "
+   echo " "
+   echo "  health-check.robot: health , core, small, medium, 3rdparty, api,  datarouter, externalapi, health-aaf, health-aai, health-appc, "
+   echo "                      health-clamp, health-cli, health-dcae, health-dmaap, health-log, health-modeling, health-msb, "
+   echo "                      health-multicloud, health-oof, health-policy, health-pomba, health-portal, health-sdc, health-sdnc, "
+   echo "                      health-so, health-uui, health-vfc, health-vid, health-vnfsdk, healthdist, healthlogin, healthmr, "
+   echo "                      healthportalapp, multicloud, oom "
+   echo " "
+   echo " hvves.robot: :HVVES, ete "
+   echo " "
+   echo " model-distribution-vcpe.robot: distributevCPEResCust "
+   echo " "
+   echo " model-distribution.robot: distribute, distributeVFWDT, distributeVLB "
+   echo " "
+   echo " oof-*.robot: cmso , has, homing "
+   echo " "
+   echo " pnf-registration.robot: ete, pnf_registrate "
+   echo " "
+   echo " post-install-tests.robot dmaapacl, postinstall"
+   echo " "
+   echo " update_onap_page.robot: UpdateWebPage "
+   echo " "
+   echo " vnf-orchestration-direct-so.robot:  instantiateVFWdirectso "
+   echo " "
+   echo " vnf-orchestration.robot: instantiate, instantiateNoDelete, stability72hr"
    exit
 fi
 
diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index 7d42fd5..8758e7d 100644
--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@ -77,6 +77,11 @@
 GLOBAL_INJECTED_POLICY_IP_ADDR = "pdp.{{include "common.namespace" .}}"
 GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.{{include "common.namespace" .}}"
 GLOBAL_INJECTED_PORTAL_IP_ADDR = "portal-app.{{include "common.namespace" .}}"
+GLOBAL_INJECTED_POLICY_API_IP_ADDR = "policy-api.{{include "common.namespace" .}}"
+GLOBAL_INJECTED_POLICY_PAP_IP_ADDR = "policy-pap.{{include "common.namespace" .}}"
+GLOBAL_INJECTED_POLICY_DISTRIBUTION_IP_ADDR = "policy-distribution.{{include "common.namespace" .}}"
+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_REGION = "{{ .Values.openStackRegion }}"
 GLOBAL_INJECTED_SCRIPT_VERSION = "{{ .Values.scriptVersion }}"
@@ -162,6 +167,11 @@
     "GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX" : "{{ .Values.openStackOamNetworkCidrPrefix }}",
     "GLOBAL_INJECTED_POLICY_IP_ADDR" : "pdp.{{include "common.namespace" .}}",
     "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : "drools.{{include "common.namespace" .}}",
+    "GLOBAL_INJECTED_POLICY_API_IP_ADDR" : "policy-api.{{include "common.namespace" .}}",
+    "GLOBAL_INJECTED_POLICY_PAP_IP_ADDR" : "policy-pap.{{include "common.namespace" .}}",
+    "GLOBAL_INJECTED_POLICY_DISTRIBUTION_IP_ADDR" : "policy-distribution.{{include "common.namespace" .}}",
+    "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_PORTAL_IP_ADDR" : "portal-app.{{include "common.namespace" .}}",
     "GLOBAL_INJECTED_PUBLIC_NET_ID" : "{{ .Values.openStackPublicNetId }}",
     "GLOBAL_INJECTED_REGION" : "{{ .Values.openStackRegion }}",
diff --git a/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml
index 1849c46..c3c6151 100644
--- a/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml
@@ -37,7 +37,7 @@
         - /root/ready.py
         args:
         - --container-name
-        - vfc-db
+        - vfc-mariadb
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml
index a25a497..e529f47 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml
@@ -32,22 +32,6 @@
       annotations:
         sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
     spec:
-      initContainers:
-#Example init container for dependency checking
-#      - command:
-#        - /root/ready.py
-#        args:
-#        - --container-name
-#        - mariadb
-#        env:
-#        - name: NAMESPACE
-#          valueFrom:
-#            fieldRef:
-#              apiVersion: v1
-#              fieldPath: metadata.namespace
-#        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
-#        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-#        name: {{ include "common.name" . }}-readiness
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
diff --git a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml
index 43eafe4..8833a5a 100644
--- a/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/charts/vfc-juju-vnfm-driver/values.yaml
@@ -29,7 +29,7 @@
 flavor: small
 
 repository: nexus3.onap.org:10001
-image: onap/vfc/jujudriver:1.3.0-STAGING-latest
+image: onap/vfc/jujudriver:1.3.0
 pullPolicy: Always
 
 #Istio sidecar injection policy
diff --git a/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml
index 24a42fe..217759e 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml
@@ -37,7 +37,7 @@
         - /root/ready.py
         args:
         - --container-name
-        - vfc-db
+        - vfc-mariadb
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/vfc/charts/vfc-db/.helmignore b/kubernetes/vfc/charts/vfc-redis/.helmignore
similarity index 100%
rename from kubernetes/vfc/charts/vfc-db/.helmignore
rename to kubernetes/vfc/charts/vfc-redis/.helmignore
diff --git a/kubernetes/vfc/charts/vfc-db/Chart.yaml b/kubernetes/vfc/charts/vfc-redis/Chart.yaml
similarity index 97%
rename from kubernetes/vfc/charts/vfc-db/Chart.yaml
rename to kubernetes/vfc/charts/vfc-redis/Chart.yaml
index 64e6c29..90ffba9 100644
--- a/kubernetes/vfc/charts/vfc-db/Chart.yaml
+++ b/kubernetes/vfc/charts/vfc-redis/Chart.yaml
@@ -14,5 +14,5 @@
 
 apiVersion: v1
 description: ONAP VFC - DB
-name: vfc-db
+name: vfc-redis
 version: 4.0.0
diff --git a/kubernetes/vfc/charts/vfc-db/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-redis/templates/deployment.yaml
similarity index 100%
rename from kubernetes/vfc/charts/vfc-db/templates/deployment.yaml
rename to kubernetes/vfc/charts/vfc-redis/templates/deployment.yaml
diff --git a/kubernetes/vfc/charts/vfc-db/templates/service.yaml b/kubernetes/vfc/charts/vfc-redis/templates/service.yaml
similarity index 100%
rename from kubernetes/vfc/charts/vfc-db/templates/service.yaml
rename to kubernetes/vfc/charts/vfc-redis/templates/service.yaml
diff --git a/kubernetes/vfc/charts/vfc-db/values.yaml b/kubernetes/vfc/charts/vfc-redis/values.yaml
similarity index 97%
rename from kubernetes/vfc/charts/vfc-db/values.yaml
rename to kubernetes/vfc/charts/vfc-redis/values.yaml
index 6991f36..a134190 100644
--- a/kubernetes/vfc/charts/vfc-db/values.yaml
+++ b/kubernetes/vfc/charts/vfc-redis/values.yaml
@@ -29,7 +29,7 @@
 flavor: small
 
 repository: nexus3.onap.org:10001
-image: onap/vfc/db:1.3.0
+image: onap/vfc/db:1.3.0-STAGING-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml
index f941ae8..67f57e8 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml
@@ -37,7 +37,7 @@
         - /root/ready.py
         args:
         - --container-name
-        - vfc-db
+        - vfc-mariadb
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml
index d197da6..5169f79 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml
@@ -37,7 +37,7 @@
         - /root/ready.py
         args:
         - --container-name
-        - vfc-db
+        - vfc-mariadb
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml
index f2a8b05..7982fec 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml
@@ -37,7 +37,7 @@
         - /root/ready.py
         args:
         - --container-name
-        - vfc-db
+        - vfc-mariadb
         env:
         - name: NAMESPACE
           valueFrom: