diff --git a/stable/factorio/Chart.yaml b/stable/factorio/Chart.yaml
index 25acf33f2318..e17b0b1dd6a6 100755
--- a/stable/factorio/Chart.yaml
+++ b/stable/factorio/Chart.yaml
@@ -1,5 +1,5 @@
 name: factorio
-version: 0.1.2
+version: 0.1.3
 description: Factorio dedicated server.
 keywords:
 - game
diff --git a/stable/factorio/templates/_helpers.tpl b/stable/factorio/templates/_helpers.tpl
index 234480de714c..f0d83d2edba6 100644
--- a/stable/factorio/templates/_helpers.tpl
+++ b/stable/factorio/templates/_helpers.tpl
@@ -3,14 +3,14 @@
 Expand the name of the chart.
 */}}
 {{- define "name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 24 -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified app name.
-We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
diff --git a/stable/factorio/templates/mods-pvc.yaml b/stable/factorio/templates/mods-pvc.yaml
index b83c14e7b07b..46bee955b438 100644
--- a/stable/factorio/templates/mods-pvc.yaml
+++ b/stable/factorio/templates/mods-pvc.yaml
@@ -9,7 +9,11 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/stable/factorio/templates/saves-pvc.yaml b/stable/factorio/templates/saves-pvc.yaml
index 01a4b2f588d9..9415bb4f0c8f 100644
--- a/stable/factorio/templates/saves-pvc.yaml
+++ b/stable/factorio/templates/saves-pvc.yaml
@@ -9,7 +9,11 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/stable/factorio/values.yaml b/stable/factorio/values.yaml
index 680c9febd309..54841287601f 100644
--- a/stable/factorio/values.yaml
+++ b/stable/factorio/values.yaml
@@ -48,7 +48,10 @@ factorio:
     password: your.password
 
 persistence:
-  storageClass: generic
+  ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
+  ## Default: volume.alpha.kubernetes.io/storage-class: default
+  ##
+  # storageClass:
   savedGames:
     # Set this to false if you don't care to persist saved games between restarts.
     enabled: true