diff --git a/barbican/values.yaml b/barbican/values.yaml
index eedc8621ac..e694e8006f 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -207,8 +207,8 @@ dependencies:
           service: identity
     rabbit_init:
       services:
-      - service: oslo_messaging
-        endpoint: internal
+        - endpoint: internal
+          service: oslo_messaging
 
 conf:
   paste:
diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index 1555d4d371..60db5fcbef 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -17,6 +17,8 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+release_group: null
+
 labels:
   api:
     node_selector_key: openstack-control-plane
diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index 7707590341..a4c2b4993f 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -19,6 +19,8 @@ deployment:
   cephfs_provisioner: true
   rgw_keystone_user_and_endpoints: false
 
+release_group: null
+
 images:
   pull_policy: IfNotPresent
   tags:
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
index 6ca0909785..781fc9e7e0 100644
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@@ -19,6 +19,8 @@ labels:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
 
+release_group: null
+
 images:
   tags:
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
diff --git a/ironic/values.yaml b/ironic/values.yaml
index 19f08e2674..80355aec0f 100644
--- a/ironic/values.yaml
+++ b/ironic/values.yaml
@@ -17,6 +17,8 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+release_group: null
+
 labels:
   api:
     node_selector_key: openstack-control-plane
diff --git a/ldap/templates/bin/_bootstrap.sh.tpl b/ldap/templates/bin/_bootstrap.sh.tpl
index 3e65185a0e..4068e5cfe8 100644
--- a/ldap/templates/bin/_bootstrap.sh.tpl
+++ b/ldap/templates/bin/_bootstrap.sh.tpl
@@ -4,5 +4,5 @@ set -xe
 {{- $url := tuple "ldap" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
 {{- $port := tuple "ldap" "internal" "ldap" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 LDAPHOST="ldap://{{ $url }}:{{ $port }}"
-ADMIN="cn={{ .Values.secrets.identity.admin }},{{ tuple .Values.openldap.domain . | include "splitdomain" }}"
-ldapadd -x -D $ADMIN -H $LDAPHOST -w {{ .Values.openldap.password }} -f /etc/sample_data.ldif
+ADMIN="cn={{ .Values.endpoints.ldap.auth.username }},{{ tuple .Values.endpoints.ldap.auth.domainname . | include "splitdomain" }}"
+ldapadd -x -D $ADMIN -H $LDAPHOST -w {{ .Values.endpoints.ldap.auth.password }} -f /etc/sample_data.ldif
diff --git a/ldap/templates/statefulset.yaml b/ldap/templates/statefulset.yaml
index 9720840d21..060e427921 100644
--- a/ldap/templates/statefulset.yaml
+++ b/ldap/templates/statefulset.yaml
@@ -46,9 +46,9 @@ spec:
         imagePullPolicy: {{ .Values.images.pull_policy }}
         env:
         - name: LDAP_DOMAIN
-          value: {{ .Values.openldap.domain }}
+          value: {{ .Values.endpoints.ldap.auth.domainname }}
         - name: LDAP_ADMIN_PASSWORD
-          value: {{ .Values.openldap.password }}
+          value: {{ .Values.endpoints.ldap.auth.password }}
         ports:
         - containerPort: {{ tuple "ldap" "internal" "ldap" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
@@ -57,31 +57,31 @@ spec:
           mountPath: /var/lib/ldap
         - name: ldap-config
           mountPath: /etc/ldap/slapd.d
-{{- if not .Values.storage.pvc.enabled }}
+{{- if not .Values.volume.enabled }}
       volumes:
       - name: ldap-data
         hostPath:
-          path: {{ .Values.storage.host.data_path }}
+          path: {{ .Values.volume.host.data_path }}
       - name: ldap-config
         hostPath:
-          path: {{ .Values.storage.host.config_path }}
+          path: {{ .Values.volume.host.config_path }}
 {{- else }}
   volumeClaimTemplates:
   - metadata:
       name: ldap-data
     spec:
       accessModes: [ "ReadWriteOnce" ]
-      storageClassName: {{ .Values.storage.pvc.class_name }}
       resources:
         requests:
-          storage: {{ .Values.storage.pvc.size }}
+          storage: {{ .Values.volume.size }}
+      storageClassName: {{ .Values.volume.class_name }}
   - metadata:
       name: ldap-config
     spec:
       accessModes: [ "ReadWriteOnce" ]
-      storageClassName: {{ .Values.storage.pvc.class_name }}
       resources:
         requests:
-          storage: {{ .Values.storage.pvc.size }}
+          storage: {{ .Values.volume.size }}
+      storageClassName: {{ .Values.volume.class_name }}
 {{- end }}
 {{- end }}
diff --git a/ldap/values.yaml b/ldap/values.yaml
index c60a75c587..19c9e5fd1b 100644
--- a/ldap/values.yaml
+++ b/ldap/values.yaml
@@ -16,6 +16,23 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+release_group: null
+
+images:
+  tags:
+    bootstrap: "docker.io/osixia/openldap:1.2.0"
+    ldap: "docker.io/osixia/openldap:1.2.0"
+    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
+  pull_policy: IfNotPresent
+
+labels:
+  server:
+    node_selector_key: openstack-control-plane
+    node_selector_value: enabled
+  job:
+    node_selector_key: openstack-control-plane
+    node_selector_value: enabled
+
 pod:
   affinity:
     anti:
@@ -55,13 +72,6 @@ pod:
       init_container: null
       ldap_data_load:
 
-images:
-  tags:
-    bootstrap: "docker.io/osixia/openldap:1.2.0"
-    ldap: "docker.io/osixia/openldap:1.2.0"
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-  pull_policy: IfNotPresent
-
 dependencies:
   static:
     ldap:
@@ -77,23 +87,14 @@ dependencies:
         - endpoint: internal
           service: ldap
 
-storage:
-  pvc:
-    enabled: true
-    size: 2Gi
-    class_name: general
+volume:
+  enabled: true
+  size: 2Gi
+  class_name: general
   host:
     data_path: /data/openstack-helm/ldap
     config_path: /data/openstack-helm/config
 
-labels:
-  server:
-    node_selector_key: openstack-control-plane
-    node_selector_value: enabled
-  job:
-    node_selector_key: openstack-control-plane
-    node_selector_value: enabled
-
 bootstrap:
   enabled: false
 
@@ -109,6 +110,10 @@ endpoints:
     port:
       ldap:
         default: 389
+    auth:
+      username: admin
+      domainname: cluster.local
+      password: password
 
 data:
   sample: |
@@ -181,15 +186,6 @@ data:
     description: Red Team
     memberUID: uid=alice,ou=People,dc=cluster,dc=local
 
-secrets:
-  identity:
-    admin: admin
-    ldap: ldap
-
-openldap:
-  domain: cluster.local
-  password: password
-
 manifests:
   configmap_bin: true
   configmap_etc: true
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 05858e53bb..009f53bbef 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+release_group: null
+
 images:
   tags:
     # NOTE: if you update from 10.2.13 please look at
diff --git a/postgresql/values.yaml b/postgresql/values.yaml
index 4a4b99ca9b..0551111723 100644
--- a/postgresql/values.yaml
+++ b/postgresql/values.yaml
@@ -16,6 +16,8 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+release_group: null
+
 pod:
   affinity:
     anti:
diff --git a/rally/values.yaml b/rally/values.yaml
index 20d3be6a05..2cb50ac734 100644
--- a/rally/values.yaml
+++ b/rally/values.yaml
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+release_group: null
+
 labels:
   job:
     node_selector_key: openstack-control-plane