diff --git a/stable/rethinkdb/Chart.yaml b/stable/rethinkdb/Chart.yaml
index 059841108a..70de8a2f1b 100644
--- a/stable/rethinkdb/Chart.yaml
+++ b/stable/rethinkdb/Chart.yaml
@@ -1,6 +1,6 @@
 name: rethinkdb
 description: The open-source database for the realtime web
-version: 0.0.1
+version: 0.0.2
 keywords:
 - rethinkdb
 - database
diff --git a/stable/rethinkdb/templates/rethinkdb-cluster-storage-class.yaml b/stable/rethinkdb/templates/rethinkdb-cluster-storage-class.yaml
index 8aff71ff6b..fd30f29ef5 100644
--- a/stable/rethinkdb/templates/rethinkdb-cluster-storage-class.yaml
+++ b/stable/rethinkdb/templates/rethinkdb-cluster-storage-class.yaml
@@ -1,5 +1,9 @@
 {{- if .Values.cluster.storageClass.enabled }}
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: {{ if .Capabilities.APIVersions.Has "storage.k8s.io/v1" -}}
+  storage.k8s.io/v1
+{{- else -}}
+  storage.k8s.io/v1beta1
+{{- end }}
 kind: StorageClass
 metadata:
   labels: