diff --git a/charts/minecraft-server/Chart.yaml b/charts/minecraft-server/Chart.yaml
index b08b0dd..698d817 100644
--- a/charts/minecraft-server/Chart.yaml
+++ b/charts/minecraft-server/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: minecraft-server
-version: 0.1.801
+version: 0.1.802
 appVersion: v0.1.8
 description: Docker Minecraft Server image with support for Plugins etc.
 home: https://github.com/qumine/minecraft-server
diff --git a/charts/minecraft-server/templates/deployment.yaml b/charts/minecraft-server/templates/deployment.yaml
index 365ae67..3d42e82 100644
--- a/charts/minecraft-server/templates/deployment.yaml
+++ b/charts/minecraft-server/templates/deployment.yaml
@@ -122,7 +122,7 @@ spec:
         - name: data
           mountPath: /data
           {{- if .Values.extraVolumeMounts }}
-          {{- toYaml .Values.extraVolumeMounts | nindent 10 }}
+          {{- toYaml .Values.extraVolumeMounts | nindent 8 }}
           {{- end }}
       {{- if .Values.integrations.bluemap.enabled }}
       - name: bluemap
@@ -141,6 +141,9 @@ spec:
         volumeMounts:
         - name: data
           mountPath: /data
+          {{- if .Values.extraVolumeMounts }}
+          {{- toYaml .Values.extraVolumeMounts | nindent 8 }}
+          {{- end }}
       {{- end }}
       {{- if .Values.integrations.geysermc.enabled }}
       - name: geysermc
@@ -157,6 +160,12 @@ spec:
           requests:
             cpu: 250m
             memory: 250Mi
+        volumeMounts:
+        - name: data
+          mountPath: /data
+          {{- if .Values.extraVolumeMounts }}
+          {{- toYaml .Values.extraVolumeMounts | nindent 8 }}
+          {{- end }}
       {{- end }}
       volumes:
       - name: data
@@ -172,5 +181,5 @@ spec:
         {{- end }}
         {{- if .Values.extraVolumes }}
         # Extra volume(s)
-        {{- toYaml .Values.extraVolumes | nindent 8 }}
+        {{- toYaml .Values.extraVolumes | nindent 6 }}
         {{- end }}
diff --git a/charts/minecraft-server/values.yaml b/charts/minecraft-server/values.yaml
index 820495f..83200ab 100644
--- a/charts/minecraft-server/values.yaml
+++ b/charts/minecraft-server/values.yaml
@@ -465,11 +465,12 @@ startupProbe:
   periodSeconds: 5
   failureThreshold: 24
 
-## Configure extra volumes
-extraVolumes: []
-
-## Configure extra volumeMounts
-extraVolumeMounts: []
+extraVolumeMounts:
+- name: tmp
+  mountPath: /tmp
+extraVolumes:
+- name: tmp
+  emptyDir: {}
 
 ## Containers, which are run before the app containers are started.
 extraInitContainers: []