diff --git a/stable/redis-ha/Chart.yaml b/stable/redis-ha/Chart.yaml
index 8f9cc31626..932762176a 100644
--- a/stable/redis-ha/Chart.yaml
+++ b/stable/redis-ha/Chart.yaml
@@ -5,7 +5,7 @@ keywords:
 - redis
 - keyvalue
 - database
-version: 0.2.3
+version: 1.0.0
 description: Highly available Redis cluster with multiple sentinels and standbys.
 icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png
 maintainers:
diff --git a/stable/redis-ha/templates/redis-deployment.yaml b/stable/redis-ha/templates/redis-deployment.yaml
deleted file mode 100644
index 9177276d55..0000000000
--- a/stable/redis-ha/templates/redis-deployment.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: {{ template "fullname" . }}
-  labels:
-    redis-node: "true"
-{{ include "labels.standard" . | indent 4 }}
-spec:
-  replicas: {{ .Values.replicas.slave }}
-  template:
-    metadata:
-      labels:
-        name: redis
-        role: replica
-{{ include "labels.standard" . | indent 8 }}
-    spec:
-      containers:
-      - name: redis
-        image: "{{ .Values.redis_image }}"
-        resources:
-{{ toYaml .Values.resources.slave | indent 10 }}
-        ports:
-        - containerPort: 6379
-        volumeMounts:
-        - mountPath: /redis-master-data
-          name: data
-      volumes:
-      - name: data
-      {{- if .Values.persistentVolume.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistentVolume.existingClaim }}{{ .Values.persistentVolume.existingClaim }}{{- else }}{{ template "fullname" . }}{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{- end -}}
diff --git a/stable/redis-ha/templates/redis-master-pvc.yaml b/stable/redis-ha/templates/redis-master-pvc.yaml
new file mode 100644
index 0000000000..def20a4d67
--- /dev/null
+++ b/stable/redis-ha/templates/redis-master-pvc.yaml
@@ -0,0 +1,25 @@
+{{- if .Values.persistentVolume.enabled }}
+{{- if not .Values.persistentVolume.existingClaim -}}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ template "fullname" . }}-master
+  labels:
+{{ include "labels.standard" . | indent 4 }}
+  annotations:
+  {{- if .Values.persistentVolume.storageClass }}
+    volume.beta.kubernetes.io/storage-class: "{{ .Values.persistentVolume.storageClass }}"
+  {{- else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- if .Values.persistentVolume.annotations }}
+{{ toYaml .Values.persistentVolume.annotations | indent 4 }}
+  {{- end }}
+spec:
+  accessModes:
+{{ toYaml .Values.persistentVolume.accessModes | indent 4 }}
+  resources:
+    requests:
+      storage: {{ .Values.persistentVolume.size | quote }}
+{{- end }}
+{{- end }}
diff --git a/stable/redis-ha/templates/redis-master-statefulset.yaml b/stable/redis-ha/templates/redis-master-statefulset.yaml
index 7382c6a224..3c074ef7fb 100644
--- a/stable/redis-ha/templates/redis-master-statefulset.yaml
+++ b/stable/redis-ha/templates/redis-master-statefulset.yaml
@@ -48,7 +48,7 @@ spec:
       - name: data
       {{- if .Values.persistentVolume.enabled }}
         persistentVolumeClaim:
-          claimName: {{ if .Values.persistentVolume.existingClaim }}{{ .Values.persistentVolume.existingClaim }}{{- else }}{{ template "fullname" . }}{{- end }}
+          claimName: {{ template "fullname" . }}-master
       {{- else }}
         emptyDir: {}
       {{- end -}}
diff --git a/stable/redis-ha/templates/redis-pvc.yaml b/stable/redis-ha/templates/redis-slave-pvc.yaml
similarity index 94%
rename from stable/redis-ha/templates/redis-pvc.yaml
rename to stable/redis-ha/templates/redis-slave-pvc.yaml
index 67a9b3b0dc..e3b1f542cb 100644
--- a/stable/redis-ha/templates/redis-pvc.yaml
+++ b/stable/redis-ha/templates/redis-slave-pvc.yaml
@@ -3,7 +3,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "fullname" . }}-slave
   labels:
 {{ include "labels.standard" . | indent 4 }}
   annotations:
diff --git a/stable/redis-ha/templates/redis-slave-statefulset.yaml b/stable/redis-ha/templates/redis-slave-statefulset.yaml
new file mode 100644
index 0000000000..9c7344cf9a
--- /dev/null
+++ b/stable/redis-ha/templates/redis-slave-statefulset.yaml
@@ -0,0 +1,36 @@
+apiVersion: apps/v1beta1
+kind: StatefulSet
+metadata:
+  labels:
+    name: {{ template "name" . }}-slave
+    redis-node: "true"
+{{ include "labels.standard" . | indent 4 }}
+  name: {{ template "fullname" . }}-slave
+spec:
+  serviceName: "redis"
+  replicas: {{ .Values.replicas.slave }}
+  template:
+    metadata:
+      labels:
+        role: slave
+{{ include "labels.standard" . | indent 8 }}
+    spec:
+      terminationGracePeriodSeconds: 10
+      containers:
+        - name: redis
+          image: "{{ .Values.redis_image }}"
+          resources:
+{{ toYaml .Values.resources.slave | indent 12 }}
+          ports:
+            - containerPort: 6379
+          volumeMounts:
+            - mountPath: /redis-master-data
+              name: data
+      volumes:
+      - name: data
+      {{- if .Values.persistentVolume.enabled }}
+        persistentVolumeClaim:
+          claimName: {{ template "fullname" . }}-slave
+      {{- else }}
+        emptyDir: {}
+      {{- end -}}
diff --git a/stable/redis-ha/values.yaml b/stable/redis-ha/values.yaml
index 4b6d2328bd..67d9ccf3ef 100644
--- a/stable/redis-ha/values.yaml
+++ b/stable/redis-ha/values.yaml
@@ -47,7 +47,7 @@ persistentVolume:
   mountPath: /data
   ## alertmanager data Persistent Volume size
   ##
-  size: 2Gi
+  size: 8Gi
 
   ## Redis data Persistent Volume Storage Class
   ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>