diff --git a/charts/java-service/Chart.yaml b/charts/java-service/Chart.yaml
index 421e585..e6aa721 100644
--- a/charts/java-service/Chart.yaml
+++ b/charts/java-service/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: java-service
 type: application
 description: Helm chart for Spring Boot application with logging and tracing
-version: 1.5.3
+version: 1.5.4
 appVersion: "v1.0"
 home: https://github.com/Romanow/helm-charts/tree/master/charts/java-service
 icon: https://raw.githubusercontent.com/Romanow/helm-charts/master/icons/spring-boot.png
diff --git a/charts/java-service/README.md b/charts/java-service/README.md
index 9da9ba4..41c4cf4 100644
--- a/charts/java-service/README.md
+++ b/charts/java-service/README.md
@@ -1,6 +1,6 @@
 # Helm Chart for java-service
 
-![Version: 1.5.3](https://img.shields.io/badge/Version-1.5.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0](https://img.shields.io/badge/AppVersion-v1.0-informational?style=flat-square)
+![Version: 1.5.4](https://img.shields.io/badge/Version-1.5.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0](https://img.shields.io/badge/AppVersion-v1.0-informational?style=flat-square)
 
 Helm chart for Spring Boot application with logging and tracing
 
diff --git a/charts/java-service/templates/deployment.yaml b/charts/java-service/templates/deployment.yaml
index 07e6752..b6b83a6 100644
--- a/charts/java-service/templates/deployment.yaml
+++ b/charts/java-service/templates/deployment.yaml
@@ -97,10 +97,11 @@ spec:
           ports:
             - name: {{ .Chart.Name }}
               containerPort: {{ .Values.ports.internal }}
-          {{- if .Values.filebeat.enabled }}
           volumeMounts:
+            {{- if .Values.filebeat.enabled }}
             - name: {{ .Chart.Name }}-logs-volume
               mountPath: "/var/log/{{ .Values.logFolder | default .Release.Name }}/"
+            {{- end }}
             {{- range $config := .Values.configVolumes }}
             - name: {{ $config.name }}
               mountPath: {{ $config.mount }}
@@ -108,7 +109,6 @@ spec:
               subPath: {{ $config.path }}
               {{- end }}
             {{- end }}
-        {{- end }}
         {{- if .Values.filebeat.enabled }}
         - name: {{ .Release.Name }}-filebeat
           image: "{{ .Values.filebeat.image.repository }}:{{ .Values.filebeat.image.tag }}"