diff --git a/kubernetes/common/certInitializer/templates/job.yaml b/kubernetes/common/certInitializer/templates/job.yaml
index 2acb423..84a3e87 100644
--- a/kubernetes/common/certInitializer/templates/job.yaml
+++ b/kubernetes/common/certInitializer/templates/job.yaml
@@ -25,6 +25,8 @@
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       initContainers: {{ include "common.certInitializer.initContainer" (dict "dot" . "initRoot" .Values) | nindent 6 }}
+      imagePullSecrets:
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"
       containers:
       - name: create-tls-secret
         command:
diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index 609d78b..4710acc 100644
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -103,3 +103,7 @@
     version: ~10.x-0
     repository: '@local'
     condition: dcae-ves-mapper.enabled
+  - name: dcae-ves-openapi-manager
+    version: ~10.x-0
+    repository: 'file://components/dcae-ves-openapi-manager'
+    condition: dcae-ves-openapi-manager.enabled
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
rename to kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml
rename to kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2/components/dcae-ves-openapi-manager/values.yaml
rename to kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
diff --git a/kubernetes/dcaegen2-services/resources/expected-components.json b/kubernetes/dcaegen2-services/resources/expected-components.json
index f654ac8..7c4c3fb 100644
--- a/kubernetes/dcaegen2-services/resources/expected-components.json
+++ b/kubernetes/dcaegen2-services/resources/expected-components.json
@@ -40,7 +40,7 @@
 */}}
 
 {{- $ctx := . -}}
-{{- $components := list "dcae-hv-ves-collector" "dcae-prh" "dcae-tcagen2" "dcae-ves-collector" -}}
+{{- $components := list "dcae-hv-ves-collector" "dcae-prh" "dcae-tcagen2" "dcae-ves-collector" "dcae-ves-openapi-manager" -}}
 {{- $enabled := dict "enabled" list -}}
 {{- range $components -}}
   {{- if index $ctx.Values . "enabled" -}}
diff --git a/kubernetes/dcaegen2-services/values.yaml b/kubernetes/dcaegen2-services/values.yaml
index 7db369c..5334cac 100644
--- a/kubernetes/dcaegen2-services/values.yaml
+++ b/kubernetes/dcaegen2-services/values.yaml
@@ -26,7 +26,8 @@
   logstashPort: 5044
 
 # Control deployment of DCAE microservices at ONAP installation time
-
+dcae-ves-openapi-manager:
+  enabled: true
 dcae-bbs-eventprocessor-ms:
   enabled: false
   logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index a14f9ee..eb69410 100644
--- a/kubernetes/dcaegen2/Chart.yaml
+++ b/kubernetes/dcaegen2/Chart.yaml
@@ -59,7 +59,4 @@
     version: ~10.x-0
     repository: 'file://components/dcae-dashboard'
     condition: dcae-dashboard.enabled
-  - name: dcae-ves-openapi-manager
-    version: ~10.x-0
-    repository: 'file://components/dcae-ves-openapi-manager'
-    condition: dcae-ves-openapi-manager.enabled
+
diff --git a/kubernetes/dcaegen2/resources/expected-components.json b/kubernetes/dcaegen2/resources/expected-components.json
index 50c3184..43125d6 100644
--- a/kubernetes/dcaegen2/resources/expected-components.json
+++ b/kubernetes/dcaegen2/resources/expected-components.json
@@ -40,7 +40,7 @@
 */}}
 
 {{- $ctx := . -}}
-{{- $components := list "dcae-cloudify-manager" "dcae-config-binding-service" "dcae-dashboard" "dcae-deployment-handler" "dcae-inventory-api" "dcae-policy-handler" "dcae-servicechange-handler" "dcae-ves-openapi-manager" -}}
+{{- $components := list "dcae-cloudify-manager" "dcae-config-binding-service" "dcae-dashboard" "dcae-deployment-handler" "dcae-inventory-api" "dcae-policy-handler" "dcae-servicechange-handler" -}}
 {{- $enabled := dict "enabled" list -}}
 {{- range $components -}}
   {{- if index $ctx.Values . "enabled" -}}
diff --git a/kubernetes/dcaegen2/values.yaml b/kubernetes/dcaegen2/values.yaml
index 7ce58ba..2c276a7 100644
--- a/kubernetes/dcaegen2/values.yaml
+++ b/kubernetes/dcaegen2/values.yaml
@@ -67,5 +67,4 @@
     cloudifyManagerPasswordExternalSecret: *cmPassSecretName
 dcae-servicechange-handler:
   enabled: false
-dcae-ves-openapi-manager:
-  enabled: true
+
diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index 0449648..7b11692 100644
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -19,7 +19,7 @@
 global:
   nodePortPrefix: 302
   aafEnabled: true
-  cassandra:
+  sdc_cassandra:
     #This flag allows SDC to instantiate its own cluster, serviceName
     #should be sdc-cs if this flag is enabled
     localCluster: false
diff --git a/kubernetes/sdc/components/sdc-cs/Chart.yaml b/kubernetes/sdc/components/sdc-cs/Chart.yaml
index 5b4d631..0789ee3 100644
--- a/kubernetes/sdc/components/sdc-cs/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-cs/Chart.yaml
@@ -30,3 +30,11 @@
   - name: serviceAccount
     version: ~10.x-0
     repository: '@local'
+  - name: cassandra
+    version: ~10.x-0
+    # local reference to common chart, as it is
+    # a part of this chart's package and will not
+    # be published independently to a repo (at this point)
+    repository: '@local'
+    condition: global.sdc_cassandra.localCluster
+
diff --git a/kubernetes/sdc/components/sdc-cs/templates/job.yaml b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
index fb849b9..4a8388a 100644
--- a/kubernetes/sdc/components/sdc-cs/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
@@ -42,7 +42,7 @@
         - /app/ready.py
         args:
         - --container-name
-        {{- if .Values.global.cassandra.localCluster }}
+        {{- if .Values.global.sdc_cassandra.localCluster }}
         - sdc-cs
         {{- else }}
         - cassandra
diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml
index e00475a..2ac9c7f 100644
--- a/kubernetes/sdc/components/sdc-cs/values.yaml
+++ b/kubernetes/sdc/components/sdc-cs/values.yaml
@@ -21,7 +21,7 @@
   readinessImage: onap/oom/readiness:3.0.1
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
-  cassandra:
+  sdc_cassandra:
     #This flag allows SDC to instantiate its own cluster, serviceName
     #should be sdc-cs if this flag is enabled
     localCluster: false
@@ -36,6 +36,19 @@
 #################################################################
 # Application configuration defaults.
 #################################################################
+
+#Used only if localCluster is enabled. Instantiates SDC's own cassandra cluster
+cassandra:
+  nameOverride: sdc-cs
+  replicaCount: 3
+  service:
+    name: sdc-cs
+  serviceAccount:
+    nameOverride: sdc-cs
+  persistence:
+    mountSubPath: sdc/sdc-cs/CS
+    enabled: true
+
 # application image
 repository: nexus3.onap.org:10001
 image: onap/sdc-cassandra:1.9.5
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
index c8edb29..d92b42a 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
@@ -82,7 +82,7 @@
           valueFrom:
             secretKeyRef: {name: {{ include "common.release" . }}-sdc-cs-secrets, key: cs_password}
         - name: CS_HOST_IP
-          value: "{{ .Values.global.cassandra.serviceName }}"
+          value: "{{ .Values.global.sdc_cassandra.serviceName }}"
         resources:
           limits:
             cpu: 800m
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index d8cc670..3ed98fe 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -20,7 +20,7 @@
   nodePortPrefix: 302
   aafEnabled: true
   persistence: {}
-  cassandra:
+  sdc_cassandra:
     #This flag allows SDC to instantiate its own cluster, serviceName
     #should be sdc-cs if this flag is enabled
     localCluster: false
diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
index 343bda8..1cfcad4 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
@@ -109,7 +109,7 @@
           - name: JAVA_OPTIONS
             value: {{ .Values.config.javaOptions }}
           - name: CS_HOSTS
-            value: "{{ .Values.global.cassandra.serviceName }}"
+            value: "{{ .Values.global.sdc_cassandra.serviceName }}"
           - name: CS_PORT
             value: "{{ .Values.config.cassandraClientPort }}"
           - name: CS_AUTHENTICATE
diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
index f7b0cfa..da3df90 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
@@ -65,7 +65,7 @@
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           env:
           - name: CS_HOST
-            value: "{{ .Values.global.cassandra.serviceName }}"
+            value: "{{ .Values.global.sdc_cassandra.serviceName }}"
           - name: CS_PORT
             value: "{{ .Values.config.cassandraClientPort }}"
           - name: CS_AUTHENTICATE
diff --git a/kubernetes/sdc/components/sdc-wfd-be/values.yaml b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
index 8b61567..d5e4eaa 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
@@ -19,7 +19,7 @@
 global:
   nodePortPrefix: 302
   aafEnabled: true
-  cassandra:
+  sdc_cassandra:
     #This flag allows SDC to instantiate its own cluster, serviceName
     #should be sdc-cs if this flag is enabled
     localCluster: false
diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index bd76b97..3b03205 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -9,7 +9,7 @@
 
     "default_attributes": {
         "disableHttp": {{ .Values.global.security.disableHttp }},
-        "CS_VIP": "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}",
+        "CS_VIP": "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}",
         "BE_VIP": "sdc-be.{{include "common.namespace" .}}",
         "ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
         "FE_VIP": "sdc-fe.{{include "common.namespace" .}}",
@@ -37,7 +37,7 @@
         },
         "Nodes": {
             "CS": [
-                "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}"
+                "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}"
             ],
             "BE": "sdc-be.{{include "common.namespace" .}}",
             "ONBOARDING_BE": "sdc-onboarding-be.{{include "common.namespace" .}}",
@@ -79,8 +79,8 @@
             "cassandra_user": "asdc_user",
             "cassandra_password": "Aa1234%^!",
             "concurrent_writes": "32",
-            "cluster_name": "{{.Values.global.cassandra.clusterName}}",
-            "datacenter_name": "{{.Values.global.cassandra.dataCenter}}",
+            "cluster_name": "{{.Values.global.sdc_cassandra.clusterName}}",
+            "datacenter_name": "{{.Values.global.sdc_cassandra.dataCenter}}",
             "multithreaded_compaction": "false",
             "cache_dir": "/var/lib/cassandra/saved_caches",
             "log_file": "/var/lib/cassandra/log/system.log",
@@ -89,10 +89,10 @@
             "socket_read_timeout": "20000",
             "socket_connect_timeout": "20000",
             "janusgraph_connection_timeout": "10000",
-            "replication_factor": "{{.Values.global.cassandra.replicaCount}}",
-            "db_cache": "{{.Values.global.cassandra.dbCache}}",
-            "read_consistency_level": "{{.Values.global.cassandra.readConsistencyLevel}}",
-            "write_consistency_level":"{{.Values.global.cassandra.writeConsistencyLevel}}"
+            "replication_factor": "{{.Values.global.sdc_cassandra.replicaCount}}",
+            "db_cache": "{{.Values.global.sdc_cassandra.dbCache}}",
+            "read_consistency_level": "{{.Values.global.sdc_cassandra.readConsistencyLevel}}",
+            "write_consistency_level":"{{.Values.global.sdc_cassandra.writeConsistencyLevel}}"
         },
       "DMAAP": {
          "consumer": {
diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml
index 98b4abe..73e9654 100644
--- a/kubernetes/sdc/values.yaml
+++ b/kubernetes/sdc/values.yaml
@@ -25,14 +25,15 @@
     keystore_password: PyhrUCFZdXIhWyohWTUhRV5mKFpLYzMx
     wf_external_user_password: S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==
   aafEnabled: true
-  cassandra:
+  sdc_cassandra:
    #This flag allows SDC to instantiate its own cluster, serviceName
-   #should be sdc-cs if this flag is enabled
+   #should be "sdc-cs" if this flag is enabled
    localCluster: false
    #The cassandra service name to connect to (default: shared cassandra service)
    serviceName: cassandra
    #Shared cassandra cluster replicaCount, should be changed if localCluster is enabled
    #to match with its own cluster replica
+   #see "cassandra: replicaCount" in file sdc-cs/values.yaml)
    replicaCount: 3
    dbCache: true
    readConsistencyLevel: ONE
@@ -63,16 +64,6 @@
     workflowUrl: 10.0.2.15
     vnfRepoPort: 8703
 
-#Used only if localCluster is enabled. Instantiates SDC's own cassandra cluster
-cassandra:
-  nameOverride: sdc-cs
-  replicaCount: 1
-  service:
-    name: sdc-cs
-  persistence:
-    mountSubPath: sdc/sdc-cs/CS
-    enabled: true
-
 # dependency / sub-chart configuration
 sdc-wfd:
   enabled: true