diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
index 651e502a3..2d1018233 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
@@ -375,6 +375,7 @@ spec:
           {{- end }}
           {{- end }}
           volumeMounts:
+           {{- toYaml .Values.controlplane.volumeMounts | default "" | nindent 12 }}
             - name: "configuration"
               mountPath: "/app/opentelemetry.properties"
               subPath: "opentelemetry.properties"
@@ -389,6 +390,7 @@ spec:
             - name: "tmp"
               mountPath: "/tmp"
       volumes:
+       {{- toYaml .Values.controlplane.volumes | default "" | nindent 8 }}
         - name: "configuration"
           configMap:
             name: {{ include "txdc.fullname" . }}-controlplane
diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
index 3d1243817..e83f31244 100644
--- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml
@@ -242,6 +242,7 @@ spec:
           {{- end }}
           {{- end }}
           volumeMounts:
+           {{- toYaml .Values.dataplane.volumeMounts | default "" | nindent 12 }}
             - name: "configuration"
               mountPath: "/app/opentelemetry.properties"
               subPath: "opentelemetry.properties"
@@ -256,6 +257,7 @@ spec:
             - name: "tmp"
               mountPath: "/tmp"
       volumes:
+       {{- toYaml .Values.dataplane.volumes | default "" | nindent 8 }}
         - name: "configuration"
           configMap:
             name: {{ include "txdc.fullname" . }}-dataplane
diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml
index 1673727e6..d43f99d15 100644
--- a/charts/tractusx-connector-azure-vault/values.yaml
+++ b/charts/tractusx-connector-azure-vault/values.yaml
@@ -244,9 +244,9 @@ controlplane:
         # -- If preset enables certificate generation via cert-manager cluster-wide issuer
         clusterIssuer: ""
   # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
-  volumeMounts: []
+  volumeMounts:
   # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
-  volumes: []
+  volumes:
   # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
@@ -444,9 +444,9 @@ dataplane:
         # -- If preset enables certificate generation via cert-manager cluster-wide issuer
         clusterIssuer: ""
   # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
-  volumeMounts: []
+  volumeMounts:
   # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
-  volumes: []
+  volumes:
   # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
@@ -498,7 +498,7 @@ postgresql:
   jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc"
   primary:
     persistence:
-  enabled: false
+      enabled: false
   readReplicas:
     persistence:
       enabled: false
diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
index 22c54ba53..9f1f789c7 100644
--- a/charts/tractusx-connector/templates/deployment-controlplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -373,6 +373,7 @@ spec:
           {{- end }}
           {{- end }}
           volumeMounts:
+           {{- toYaml .Values.controlplane.volumeMounts | default "" | nindent 12 }}
             - name: "configuration"
               mountPath: "/app/opentelemetry.properties"
               subPath: "opentelemetry.properties"
@@ -387,6 +388,7 @@ spec:
             - name: "tmp"
               mountPath: "/tmp"
       volumes:
+       {{- toYaml .Values.controlplane.volumes | default "" | nindent 8 }}
         - name: "configuration"
           configMap:
             name: {{ include "txdc.fullname" . }}-controlplane
diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml
index 0501562ea..9a6bcdc59 100644
--- a/charts/tractusx-connector/templates/deployment-dataplane.yaml
+++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml
@@ -241,6 +241,7 @@ spec:
           {{- end }}
           {{- end }}
           volumeMounts:
+           {{- toYaml .Values.dataplane.volumeMounts | default "" | nindent 12 }}
             - name: "configuration"
               mountPath: "/app/opentelemetry.properties"
               subPath: "opentelemetry.properties"
@@ -255,6 +256,7 @@ spec:
             - name: "tmp"
               mountPath: "/tmp"
       volumes:
+       {{- toYaml .Values.dataplane.volumes | default "" | nindent 8 }}
         - name: "configuration"
           configMap:
             name: {{ include "txdc.fullname" . }}-dataplane
diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
index 76b50711c..5502a9f5b 100644
--- a/charts/tractusx-connector/values.yaml
+++ b/charts/tractusx-connector/values.yaml
@@ -244,9 +244,9 @@ controlplane:
         # -- If preset enables certificate generation via cert-manager cluster-wide issuer
         clusterIssuer: ""
   # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
-  volumeMounts: []
+  volumeMounts:
   # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
-  volumes: []
+  volumes:
   # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
   resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
@@ -442,9 +442,9 @@ dataplane:
         # -- If preset enables certificate generation via cert-manager cluster-wide issuer
         clusterIssuer: ""
   # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
-  volumeMounts: []
+  volumeMounts:
   # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
-  volumes: []
+  volumes:
   # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
   resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious