diff --git a/stable/distribution/README.md b/stable/distribution/README.md
index f3b9a5a19..e2d4a0d80 100644
--- a/stable/distribution/README.md
+++ b/stable/distribution/README.md
@@ -234,13 +234,11 @@ Create trust between the nodes by copying the ca.crt from the Artifactory server
  ```
  
  This will, in turn:
--* Create a configMap with the files you specified above
--* Create a volume pointing to the configMap with the name `distribution-configmaps`
-+* Create a configMap with the files you specified above
-+* Create a volume pointing to the configMap with the name `distribution-configmaps`
- * Mount said configMap onto `/tmp` using a `customVolumeMounts`
- * Using preStartCommand copy the `ca.crt` file to xray trusted keys folder `/etc/security/keys/trusted/ca.crt`
- * `router.tlsEnabled` is set to true to add HTTPS scheme in liveness and readiness probes.
+* Create a configMap with the files you specified above
+* Create a volume pointing to the configMap with the name `distribution-configmaps`
+* Mount said configMap onto `/tmp` using a `customVolumeMounts`
+* Using preStartCommand copy the `ca.crt` file to xray trusted keys folder `/etc/security/keys/trusted/ca.crt`
+* `router.tlsEnabled` is set to true to add HTTPS scheme in liveness and readiness probes.
  
 
 ## Custom init containers
@@ -328,13 +326,15 @@ The following table lists the configurable parameters of the distribution chart
 | `logger.image.tag`                              | Tag for logger image                                                   | `1.31.1`                                                             |
 | `common.uid`                                    | Distribution and Distributor process user ID                           | `1020`                                                             |
 | `common.gid`                                    | Distribution and Distributor process group ID                          | `1020`                                                             |
-| `common.customVolumes`                          | Custom Volumes for Distribution                                        | see [values.yaml](values.yaml)                                     |
+| `common.customVolumes`                          | Custom Volumes                                                         | see [values.yaml](values.yaml)                                     |
+| `common.configMaps`                             | Custom configMaps                                                      | see [values.yaml](values.yaml)                                     |
+| `common.customInitContainers`                   | Custom InitContainers                                                  | see [values.yaml](values.yaml)                                     |
+| `common.customSidecarContainers`                | Custom SidecarContainers                                               | see [values.yaml](values.yaml)                                     |
 | `distribution.name`                             | Distribution name                                                      | `distribution`                                                     |
 | `distribution.image.pullPolicy`                 | Container pull policy                                                  | `IfNotPresent`                                                     |
 | `distribution.image.repository`                 | Container image                                                        | `docker.bintray.io/jfrog/distribution-distribution`                |
 | `distribution.image.version`                    | Container image tag                                                    | `.Chart.AppVersion`                                                |
 | `distribution.service.type`                     | Distribution service type                                              | `ClusterIP`                                                        |
-| `distribution.customInitContainers`             | Custom init containers for Distribution                                |                                                                    |
 | `distribution.customVolumeMounts`               | Custom Volume Mounts for Distribution                                  | see [values.yaml](values.yaml)                                     |
 | `distribution.externalPort`                     | Distribution service external port                                     | `80`                                                               |
 | `distribution.internalPort`                     | Distribution service internal port                                     | `8080`                                                             |
diff --git a/stable/distribution/templates/distribution-statefulset.yaml b/stable/distribution/templates/distribution-statefulset.yaml
index 7df1ed00a..3cd220a23 100644
--- a/stable/distribution/templates/distribution-statefulset.yaml
+++ b/stable/distribution/templates/distribution-statefulset.yaml
@@ -124,8 +124,8 @@ spec:
         - name: distribution-data
           mountPath: {{ .Values.distribution.persistence.mountPath | quote }}
       {{- end }}
-    {{- if .Values.common.customInitContainers }}
-{{ tpl .Values.common.customInitContainers . | indent 6}}
+    {{- with .Values.common.customInitContainers }}
+{{ tpl . $ | indent 6}}
     {{- end }}
       containers:
       - name: {{ .Values.distribution.name }}
@@ -403,8 +403,8 @@ spec:
 {{ toYaml .Values.filebeat.resources | indent 10 }}
         terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
       {{- end }}
-{{- if .Values.common.customSidecarContainers }}
-{{ tpl .Values.common.customSidecarContainers . | indent 6 }}
+{{- with .Values.common.customSidecarContainers }}
+{{ tpl . $ | indent 6 }}
 {{- end }}
   {{- with .Values.distribution.nodeSelector }}
       nodeSelector: