diff --git a/templates/fluentbit-logs/daemonset.yaml b/templates/fluentbit-logs/daemonset.yaml
index caac986789b7cf07ec9a96446138180679c816d8..e384fc6c995b686a734617d7b0785454eadeb44e 100644
--- a/templates/fluentbit-logs/daemonset.yaml
+++ b/templates/fluentbit-logs/daemonset.yaml
@@ -44,7 +44,7 @@ spec:
               mountPath: /etc/machine-id
               readOnly: true
           {{- if .Values.logs.fluentbit.extraVolumeMounts }}
-            {{- toYaml .Values.logs.fluentbit.extraVolumeMounts | nindent 6 }}
+            {{- toYaml .Values.logs.fluentbit.extraVolumeMounts | nindent 12 }}
           {{- end }}
       volumes:
         - name: config
diff --git a/templates/fluentbit-metrics/statefulset.yaml b/templates/fluentbit-metrics/statefulset.yaml
index 4fe610aed3e9cb1ce2118adb29217366edb9acd4..0cb8f8c98077a23f44002b36a43ad5f08e6e7021 100644
--- a/templates/fluentbit-metrics/statefulset.yaml
+++ b/templates/fluentbit-metrics/statefulset.yaml
@@ -40,7 +40,7 @@ spec:
             - name: fluentbit
               mountPath: /flb-storage/
           {{- if .Values.metrics.fluentbit.extraVolumeMounts }}
-            {{- toYaml .Values.metrics.fluentbit.extraVolumeMounts | nindent 6 }}
+            {{- toYaml .Values.metrics.fluentbit.extraVolumeMounts | nindent 12 }}
           {{- end }}
       {{- if or (.Values.metrics.defaultNodeSelector) (.Values.metrics.fluentbit.nodeSelector) }}
       nodeSelector:
diff --git a/tests/fluentbit-logs/daemonset.yaml b/tests/fluentbit-logs/daemonset.yaml
index 4669c91976fe0faa44f0a84cf480148fe3c4dd15..d16a6537c8f96cee5c29ccb4c299449ee98663a6 100644
--- a/tests/fluentbit-logs/daemonset.yaml
+++ b/tests/fluentbit-logs/daemonset.yaml
@@ -36,3 +36,16 @@ tests:
           apiVersion: "apps/v1"
           name: it-monit-logs-collector-fluentbit
         not: true
+  - it: should deploy extra volume mounts if configured
+    set:
+      logs.enabled: true
+      logs.fluentbit.enabled: true
+      logs.fluentbit.extraVolumeMounts:
+        - name: test
+          mountPath: /test
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: test
+            mountPath: /test
diff --git a/tests/fluentbit-metrics/statefulset.yaml b/tests/fluentbit-metrics/statefulset.yaml
index 56f19e06a37f517a6b0565b5a5138f340cb87c32..597d557fc3388af0f3e422cf7733eb60094ae9af 100644
--- a/tests/fluentbit-metrics/statefulset.yaml
+++ b/tests/fluentbit-metrics/statefulset.yaml
@@ -27,3 +27,16 @@ tests:
           apiVersion: "apps/v1"
           name: it-monit-metrics-collector-fluentbit
         not: true
+  - it: should deploy extra volume mounts if configured
+    set:
+      metrics.enabled: true
+      metrics.fluentbit.enabled: true
+      metrics.fluentbit.extraVolumeMounts:
+        - name: test
+          mountPath: /test
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: test
+            mountPath: /test