diff --git a/helm/template/Chart.yaml b/helm/template/Chart.yaml
index 7ac6647..e2c3ca4 100644
--- a/helm/template/Chart.yaml
+++ b/helm/template/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: template
 description: A Helm library chart containing common templates, keeping application templates short
 type: library
-version: 0.5.0
+version: 0.5.1
 maintainers:
   - name: Jim Martens
     url: https://2martens.de
@@ -10,8 +10,8 @@ sources:
   - https://github.com/2martens/cloud-configuration
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: Add ability to configure volumes/volume mounts
+    - kind: fixed
+      description: Only print volumes and volumeMounts if they are filled
   artifacthub.io/signKey: |
     fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8
     url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc
diff --git a/helm/template/templates/_deployment.yaml b/helm/template/templates/_deployment.yaml
index d82b630..4404846 100644
--- a/helm/template/templates/_deployment.yaml
+++ b/helm/template/templates/_deployment.yaml
@@ -58,12 +58,16 @@ spec:
             - name: {{ .name }}
               value: {{ tpl (quote .value) $ }}
           {{- end }}
+          {{- if or .Values.application.isSpring .Values.volumeMounts }}
           volumeMounts:
           {{- if .Values.application.isSpring }}
             - mountPath: /tmp
               name: tmp
           {{- end }}
-          {{- toYaml .Values.volumeMounts | nindent 12 }}
+          {{- if .Values.volumeMounts }}
+            {{- toYaml .Values.volumeMounts | nindent 12 }}
+          {{- end }}
+          {{- end }}
           ports:
             - name: http
               containerPort: {{ .Values.application.port }}
@@ -117,13 +121,17 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if or .Values.application.isSpring .Values.volumes }}
       volumes:
       {{- if .Values.application.isSpring }}
         - name: tmp
           emptyDir:
             medium: Memory
       {{- end }}
+      {{- if .Values.volumes }}
       {{- toYaml .Values.volumes | nindent 8 }}
+      {{- end }}
+      {{- end }}
       {{- with .Values.podSpec }}
       {{- toYaml . | nindent 6 }}
       {{- end }}