diff --git a/charts/minecraft-bedrock/Chart.yaml b/charts/minecraft-bedrock/Chart.yaml
index c66bb2ad..f414e0f2 100644
--- a/charts/minecraft-bedrock/Chart.yaml
+++ b/charts/minecraft-bedrock/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: minecraft-bedrock
-version: 1.2.0
+version: 1.2.1
 appVersion: SeeValues
 home: https://minecraft.net/
 description: Minecraft server
diff --git a/charts/minecraft-bedrock/templates/deployment.yaml b/charts/minecraft-bedrock/templates/deployment.yaml
index 31aca0d2..a5a8b140 100644
--- a/charts/minecraft-bedrock/templates/deployment.yaml
+++ b/charts/minecraft-bedrock/templates/deployment.yaml
@@ -138,7 +138,9 @@ spec:
         - name: datadir
           mountPath: /data
         {{- range .Values.extraVolumes }}
-        {{- toYaml .volumeMounts | nindent 8 }}
+        {{-   if .volumeMounts }}
+        {{-     toYaml .volumeMounts | nindent 8 }}
+        {{-   end }}
         {{- end }}
       volumes:
       - name: datadir
diff --git a/charts/minecraft-proxy/Chart.yaml b/charts/minecraft-proxy/Chart.yaml
index 1e133ab0..9cf835d7 100644
--- a/charts/minecraft-proxy/Chart.yaml
+++ b/charts/minecraft-proxy/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: minecraft-proxy
-version: 2.5.0
+version: 2.5.1
 appVersion: SeeValues
 description: Minecraft proxy server (BungeeCord, Waterfall, Velocity, etc.)
 keywords:
diff --git a/charts/minecraft-proxy/templates/deployment.yaml b/charts/minecraft-proxy/templates/deployment.yaml
index a4f1c253..066ab79c 100644
--- a/charts/minecraft-proxy/templates/deployment.yaml
+++ b/charts/minecraft-proxy/templates/deployment.yaml
@@ -151,7 +151,9 @@ spec:
           subPath: config.yml
         {{- end }}
         {{- range .Values.extraVolumes }}
-        {{- toYaml .volumeMounts | nindent 8 }}
+        {{-   if .volumeMounts }}
+        {{-     toYaml .volumeMounts | nindent 8 }}
+        {{-   end }}
         {{- end }}
       volumes:
       - name: datadir
diff --git a/charts/minecraft/Chart.yaml b/charts/minecraft/Chart.yaml
index 91667752..b5712194 100755
--- a/charts/minecraft/Chart.yaml
+++ b/charts/minecraft/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: minecraft
-version: 3.8.1
+version: 3.8.2
 appVersion: SeeValues
 home: https://minecraft.net/
 description: Minecraft server
diff --git a/charts/minecraft/templates/deployment.yaml b/charts/minecraft/templates/deployment.yaml
index 17d66040..f396e978 100644
--- a/charts/minecraft/templates/deployment.yaml
+++ b/charts/minecraft/templates/deployment.yaml
@@ -127,7 +127,9 @@ spec:
           mountPath: /config/rclone
         {{- end }}
         {{- range .Values.extraVolumes }}
-        {{- toYaml .volumeMounts | nindent 8 }}
+        {{-   if .volumeMounts }}
+        {{-     toYaml .volumeMounts | nindent 8 }}
+        {{-   end }}
         {{- end }}
       {{- end }}
       - name: {{ template "minecraft.fullname" . }}
@@ -334,7 +336,9 @@ spec:
           mountPath: {{ default "/backups" .Values.mcbackup.destDir }}
           readOnly: true
         {{- range .Values.extraVolumes }}
-        {{- toYaml .volumeMounts | nindent 8 }}
+        {{-   if .volumeMounts }}
+        {{-     toYaml .volumeMounts | nindent 8 }}
+        {{-   end }}
         {{- end }}
       {{- if .Values.sidecarContainers }}
       {{- toYaml .Values.sidecarContainers | nindent 6 }}