diff --git a/stable/rethinkdb/Chart.yaml b/stable/rethinkdb/Chart.yaml
index 5be90777c4..4a1aa72163 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.1.0
+version: 0.1.1
 keywords:
 - rethinkdb
 - database
diff --git a/stable/rethinkdb/templates/_helpers.tpl b/stable/rethinkdb/templates/_helpers.tpl
index 30cca97746..f071871950 100644
--- a/stable/rethinkdb/templates/_helpers.tpl
+++ b/stable/rethinkdb/templates/_helpers.tpl
@@ -14,3 +14,21 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "rethinkdb.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "rethinkdb.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "rethinkdb.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
diff --git a/stable/rethinkdb/templates/auth/clusterrole.yaml b/stable/rethinkdb/templates/auth/clusterrole.yaml
new file mode 100644
index 0000000000..4eb752c381
--- /dev/null
+++ b/stable/rethinkdb/templates/auth/clusterrole.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.rbac.create -}}
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: {{ template "rethinkdb.fullname" . }}
+  labels:
+    app: {{ template "rethinkdb.name" . }}
+    chart: {{ template "rethinkdb.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+rules:
+  - apiGroups: [""]
+    resources: ["endpoints"]
+    verbs: ["get", "list", "watch"]
+{{- end -}}
diff --git a/stable/rethinkdb/templates/auth/clusterrolebinding.yaml b/stable/rethinkdb/templates/auth/clusterrolebinding.yaml
new file mode 100644
index 0000000000..2f5f983b03
--- /dev/null
+++ b/stable/rethinkdb/templates/auth/clusterrolebinding.yaml
@@ -0,0 +1,19 @@
+{{- if .Values.rbac.create -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ template "rethinkdb.fullname" . }}
+  labels:
+    app: {{ template "rethinkdb.name" . }}
+    chart: {{ template "rethinkdb.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ template "rethinkdb.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "rethinkdb.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end -}}
diff --git a/stable/rethinkdb/templates/auth/serviceaccount.yaml b/stable/rethinkdb/templates/auth/serviceaccount.yaml
new file mode 100644
index 0000000000..938ce67bd7
--- /dev/null
+++ b/stable/rethinkdb/templates/auth/serviceaccount.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "rethinkdb.serviceAccountName" . }}
+  labels:
+    app: {{ template "rethinkdb.name" . }}
+    chart: {{ template "rethinkdb.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- end -}}
diff --git a/stable/rethinkdb/templates/rethinkdb-admin-service.yaml b/stable/rethinkdb/templates/rethinkdb-admin-service.yaml
index fdc7347104..0413699646 100644
--- a/stable/rethinkdb/templates/rethinkdb-admin-service.yaml
+++ b/stable/rethinkdb/templates/rethinkdb-admin-service.yaml
@@ -4,7 +4,7 @@ metadata:
   name: "{{ template "rethinkdb.fullname" . }}-admin"
   labels:
     app: "{{ template "rethinkdb.name" . }}-admin"
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "rethinkdb.chart" . }}
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
 spec:
diff --git a/stable/rethinkdb/templates/rethinkdb-cluster-service.yaml b/stable/rethinkdb/templates/rethinkdb-cluster-service.yaml
index c3c0ab262b..69e692da09 100644
--- a/stable/rethinkdb/templates/rethinkdb-cluster-service.yaml
+++ b/stable/rethinkdb/templates/rethinkdb-cluster-service.yaml
@@ -4,7 +4,7 @@ metadata:
   name: "{{ template "rethinkdb.fullname" . }}-cluster"
   labels:
     app: "{{ template "rethinkdb.name" . }}-cluster"
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "rethinkdb.chart" . }}
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
   annotations:
diff --git a/stable/rethinkdb/templates/rethinkdb-cluster-stateful-set.yaml b/stable/rethinkdb/templates/rethinkdb-cluster-stateful-set.yaml
index c0c5488ffa..1d89dbe964 100644
--- a/stable/rethinkdb/templates/rethinkdb-cluster-stateful-set.yaml
+++ b/stable/rethinkdb/templates/rethinkdb-cluster-stateful-set.yaml
@@ -4,7 +4,7 @@ metadata:
   name: "{{ template "rethinkdb.fullname" . }}-cluster"
   labels:
     app: "{{ template "rethinkdb.name" . }}-cluster"
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "rethinkdb.chart" . }}
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
 spec:
@@ -17,12 +17,13 @@ spec:
         app: "{{ template "rethinkdb.name" . }}-cluster"
         heritage: {{ .Release.Service | quote }}
         release: {{ .Release.Name | quote }}
-        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        chart: {{ template "rethinkdb.chart" . }}
       annotations:
       {{- if .Values.cluster.podAnnotations }}
 {{ toYaml .Values.cluster.podAnnotations | indent 8 }}
       {{- end }}
     spec:
+      serviceAccountName: {{ template "rethinkdb.serviceAccountName" . }}
       containers:
         - name: {{ template "rethinkdb.name" . }}-cluster
           image: "{{ .Values.image.name }}:{{ .Values.image.tag }}"
diff --git a/stable/rethinkdb/templates/rethinkdb-cluster-storage-class.yaml b/stable/rethinkdb/templates/rethinkdb-cluster-storage-class.yaml
index 6c5d2874d1..562630e258 100644
--- a/stable/rethinkdb/templates/rethinkdb-cluster-storage-class.yaml
+++ b/stable/rethinkdb/templates/rethinkdb-cluster-storage-class.yaml
@@ -8,7 +8,7 @@ kind: StorageClass
 metadata:
   labels:
     app: "{{ template "rethinkdb.name" . }}-cluster"
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "rethinkdb.chart" . }}
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
   name: {{ template "rethinkdb.fullname" . }}
diff --git a/stable/rethinkdb/templates/rethinkdb-proxy-deployment.yaml b/stable/rethinkdb/templates/rethinkdb-proxy-deployment.yaml
index ec40081585..713d54aef8 100644
--- a/stable/rethinkdb/templates/rethinkdb-proxy-deployment.yaml
+++ b/stable/rethinkdb/templates/rethinkdb-proxy-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: "{{ template "rethinkdb.fullname" . }}-proxy"
   labels:
     app: "{{ template "rethinkdb.name" . }}-proxy"
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "rethinkdb.chart" . }}
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
 spec:
@@ -16,12 +16,13 @@ spec:
         app: {{ template "rethinkdb.name" . }}-proxy
         heritage: {{ .Release.Service | quote }}
         release: {{ .Release.Name | quote }}
-        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        chart: {{ template "rethinkdb.chart" . }}
       annotations:
       {{- if .Values.proxy.podAnnotations }}
 {{ toYaml .Values.proxy.podAnnotations | indent 8 }}
       {{- end }}
     spec:
+      serviceAccountName: {{ template "rethinkdb.serviceAccountName" . }}
       containers:
         - name: {{ template "rethinkdb.name" . }}-proxy
           image: "{{ .Values.image.name }}:{{ .Values.image.tag }}"
diff --git a/stable/rethinkdb/templates/rethinkdb-proxy-service.yaml b/stable/rethinkdb/templates/rethinkdb-proxy-service.yaml
index cc74d8942e..aa3167fac7 100644
--- a/stable/rethinkdb/templates/rethinkdb-proxy-service.yaml
+++ b/stable/rethinkdb/templates/rethinkdb-proxy-service.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "rethinkdb.fullname" . }}-proxy
   labels:
     app: {{ template "rethinkdb.name" . }}-proxy
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    chart: {{ template "rethinkdb.chart" . }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   annotations:
diff --git a/stable/rethinkdb/templates/rethinkdb-secrets.yaml b/stable/rethinkdb/templates/rethinkdb-secrets.yaml
index 508461955d..4fb5c6224b 100644
--- a/stable/rethinkdb/templates/rethinkdb-secrets.yaml
+++ b/stable/rethinkdb/templates/rethinkdb-secrets.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "rethinkdb.fullname" . }}
   labels:
     app: {{ template "rethinkdb.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "rethinkdb.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 type: Opaque
diff --git a/stable/rethinkdb/values.yaml b/stable/rethinkdb/values.yaml
index ce7335104e..f2fba2de45 100644
--- a/stable/rethinkdb/values.yaml
+++ b/stable/rethinkdb/values.yaml
@@ -25,7 +25,7 @@ cluster:
   persistentVolume:
     enabled: true
     # If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    #storageClass: fast
+    # storageClass: fast
     accessModes:
       - ReadWriteOnce
     size: 1Gi
@@ -68,8 +68,19 @@ proxy:
 # RethinkDB Ports
 ports:
   cluster: 29015
-  driver:  28015
-  admin:   8080
+  driver: 28015
+  admin: 8080
 
 # RethinkDB Admin Password
 rethinkdbPassword: rethinkdb
+
+rbac:
+  # Specifies whether RBAC resources should be created
+  create: true
+
+serviceAccount:
+  # Specifies whether a ServiceAccount should be created
+  create: true
+  # The name of the ServiceAccount to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: