diff --git a/stable/redis-ha/Chart.yaml b/stable/redis-ha/Chart.yaml
index e6f3f95b1b..7ffdf08cf0 100644
--- a/stable/redis-ha/Chart.yaml
+++ b/stable/redis-ha/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
 - redis
 - keyvalue
 - database
-version: 3.7.12
+version: 3.7.13
 appVersion: 5.0.5
 description: Highly available Kubernetes implementation of Redis
 icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png
diff --git a/stable/redis-ha/templates/_configs.tpl b/stable/redis-ha/templates/_configs.tpl
new file mode 100644
index 0000000000..4b83592f0f
--- /dev/null
+++ b/stable/redis-ha/templates/_configs.tpl
@@ -0,0 +1,237 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{- define "config-redis.conf" }}
+{{- if .Values.redis.customConfig }}
+{{ tpl .Values.redis.customConfig . | indent 4 }}
+{{- else }}
+    dir "/data"
+    port {{ .Values.redis.port }}
+    {{- range $key, $value := .Values.redis.config }}
+    {{ $key }} {{ $value }}
+    {{- end }}
+{{- if .Values.auth }}
+    requirepass replace-default-auth
+    masterauth replace-default-auth
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "config-sentinel.conf" }}
+{{- if .Values.sentinel.customConfig }}
+{{ tpl .Values.sentinel.customConfig . | indent 4 }}
+{{- else }}
+    dir "/data"
+    {{- $root := . -}}
+    {{- range $key, $value := .Values.sentinel.config }}
+    sentinel {{ $key }} {{ $root.Values.redis.masterGroupName }} {{ $value }}
+    {{- end }}
+{{- if .Values.auth }}
+    sentinel auth-pass {{ .Values.redis.masterGroupName }} replace-default-auth
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "config-init.sh" }}
+    HOSTNAME="$(hostname)"
+    INDEX="${HOSTNAME##*-}"
+    MASTER="$(redis-cli -h {{ template "redis-ha.fullname" . }} -p {{ .Values.sentinel.port }} sentinel get-master-addr-by-name {{ .Values.redis.masterGroupName }} | grep -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')"
+    MASTER_GROUP="{{ .Values.redis.masterGroupName }}"
+    QUORUM="{{ .Values.sentinel.quorum }}"
+    REDIS_CONF=/data/conf/redis.conf
+    REDIS_PORT={{ .Values.redis.port }}
+    SENTINEL_CONF=/data/conf/sentinel.conf
+    SENTINEL_PORT={{ .Values.sentinel.port }}
+    SERVICE={{ template "redis-ha.fullname" . }}
+    set -eu
+
+    sentinel_update() {
+        echo "Updating sentinel config with master $MASTER"
+        eval MY_SENTINEL_ID="\${SENTINEL_ID_$INDEX}"
+        sed -i "1s/^/sentinel myid $MY_SENTINEL_ID\\n/" "$SENTINEL_CONF"
+        sed -i "2s/^/sentinel monitor $MASTER_GROUP $1 $REDIS_PORT $QUORUM \\n/" "$SENTINEL_CONF"
+        echo "sentinel announce-ip $ANNOUNCE_IP" >> $SENTINEL_CONF
+        echo "sentinel announce-port $SENTINEL_PORT" >> $SENTINEL_CONF
+    }
+
+    redis_update() {
+        echo "Updating redis config"
+        echo "slaveof $1 $REDIS_PORT" >> "$REDIS_CONF"
+        echo "slave-announce-ip $ANNOUNCE_IP" >> $REDIS_CONF
+        echo "slave-announce-port $REDIS_PORT" >> $REDIS_CONF
+    }
+
+    copy_config() {
+        cp /readonly-config/redis.conf "$REDIS_CONF"
+        cp /readonly-config/sentinel.conf "$SENTINEL_CONF"
+    }
+
+    setup_defaults() {
+        echo "Setting up defaults"
+        if [ "$INDEX" = "0" ]; then
+            echo "Setting this pod as the default master"
+            redis_update "$ANNOUNCE_IP"
+            sentinel_update "$ANNOUNCE_IP"
+            sed -i "s/^.*slaveof.*//" "$REDIS_CONF"
+        else
+            DEFAULT_MASTER="$(getent hosts "$SERVICE-announce-0" | awk '{ print $1 }')"
+            if [ -z "$DEFAULT_MASTER" ]; then
+                echo "Unable to resolve host"
+                exit 1
+            fi
+            echo "Setting default slave config.."
+            redis_update "$DEFAULT_MASTER"
+            sentinel_update "$DEFAULT_MASTER"
+        fi
+    }
+
+    find_master() {
+        echo "Attempting to find master"
+        if [ "$(redis-cli -h "$MASTER"{{ if .Values.auth }} -a "$AUTH"{{ end }} ping)" != "PONG" ]; then
+           echo "Can't ping master, attempting to force failover"
+           if redis-cli -h "$SERVICE" -p "$SENTINEL_PORT" sentinel failover "$MASTER_GROUP" | grep -q 'NOGOODSLAVE' ; then 
+               setup_defaults
+               return 0
+           fi
+           sleep 10
+           MASTER="$(redis-cli -h $SERVICE -p $SENTINEL_PORT sentinel get-master-addr-by-name $MASTER_GROUP | grep -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')"
+           if [ "$MASTER" ]; then
+               sentinel_update "$MASTER"
+               redis_update "$MASTER"
+           else
+              echo "Could not failover, exiting..."
+              exit 1
+           fi
+        else
+            echo "Found reachable master, updating config"
+            sentinel_update "$MASTER"
+            redis_update "$MASTER"
+        fi
+    }
+
+    mkdir -p /data/conf/
+
+    echo "Initializing config.."
+    copy_config
+
+    ANNOUNCE_IP=$(getent hosts "$SERVICE-announce-$INDEX" | awk '{ print $1 }')
+    if [ -z "$ANNOUNCE_IP" ]; then
+        "Could not resolve the announce ip for this pod"
+        exit 1
+    elif [ "$MASTER" ]; then
+        find_master
+    else
+        setup_defaults
+    fi
+
+    if [ "${AUTH:-}" ]; then
+        echo "Setting auth values"
+        ESCAPED_AUTH=$(echo "$AUTH" | sed -e 's/[\/&]/\\&/g');
+        sed -i "s/replace-default-auth/${ESCAPED_AUTH}/" "$REDIS_CONF" "$SENTINEL_CONF"
+    fi
+
+    echo "Ready..."
+{{- end }}
+
+{{- define "config-haproxy.cfg" }}
+{{- if .Values.haproxy.customConfig }}
+{{ .Values.haproxy.customConfig | indent 4}}
+{{- else }}
+    defaults REDIS
+      mode tcp
+      timeout connect  {{ .Values.haproxy.timeout.connect }}
+      timeout server  {{ .Values.haproxy.timeout.server }}
+      timeout client  {{ .Values.haproxy.timeout.client }}
+
+    listen health_check_http_url
+      bind :8888
+      mode http
+      monitor-uri /healthz
+      option      dontlognull
+
+    {{- $root := . }}
+    {{- $fullName := include "redis-ha.fullname" . }}
+    {{- $replicas := int .Values.replicas }}
+    {{- range $i := until $replicas }}
+    # Check Sentinel and whether they are nominated master
+    backend check_if_redis_is_master_{{ $i }}
+      mode tcp
+      option tcp-check
+      tcp-check connect
+      {{- if $root.auth }}
+      tcp-check send AUTH\ {{ $root.redisPassword }}\r\n
+      tcp-check expect string +OK
+      {{- end }}
+      tcp-check send PING\r\n
+      tcp-check expect string +PONG
+      tcp-check send SENTINEL\ get-master-addr-by-name\ mymaster\r\n
+      tcp-check expect string REPLACE_ANNOUNCE{{ $i }}
+      tcp-check send QUIT\r\n
+      tcp-check expect string +OK
+      {{- range $i := until $replicas }}
+      server R{{ $i }} {{ $fullName }}-announce-{{ $i }}:26379 check inter 1s
+      {{- end }}
+    {{- end }}
+
+    # decide redis backend to use
+    #master
+    frontend ft_redis_master
+      bind *:{{ $root.Values.redis.port }}
+      use_backend bk_redis_master
+    {{ if .Values.haproxy.readOnly.enabled }}
+    #slave
+    frontend ft_redis_slave
+      bind *:{{ .Values.haproxy.readOnly.port }}
+      use_backend bk_redis_slave
+    {{- end }}
+    # Check all redis servers to see if they think they are master
+    backend bk_redis_master
+      mode tcp
+      option tcp-check
+      tcp-check connect
+      {{- if .Values.auth }}
+      tcp-check send AUTH\ {{ .Values.redisPassword }}\r\n
+      tcp-check expect string +OK
+      {{- end }}
+      tcp-check send PING\r\n
+      tcp-check expect string +PONG
+      tcp-check send info\ replication\r\n
+      tcp-check expect string role:master
+      tcp-check send QUIT\r\n
+      tcp-check expect string +OK
+      {{- range $i := until $replicas }}
+      use-server R{{ $i }} if { srv_is_up(R{{ $i }}) } { nbsrv(check_if_redis_is_master_{{ $i }}) ge 2 }
+      server R{{ $i }} {{ $fullName }}-announce-{{ $i }}:{{ $root.Values.redis.port }} check inter 1s fall 1 rise 1
+      {{- end }}
+    {{ if .Values.haproxy.readOnly.enabled }}
+    backend bk_redis_slave
+      mode tcp
+      option tcp-check
+      tcp-check connect
+      {{- if .Values.auth }}
+      tcp-check send AUTH\ {{ .Values.redisPassword }}\r\n
+      tcp-check expect string +OK
+      {{- end }}
+      tcp-check send PING\r\n
+      tcp-check expect string +PONG
+      tcp-check send info\ replication\r\n
+      tcp-check expect  string role:slave
+      tcp-check send QUIT\r\n
+      tcp-check expect string +OK
+      {{- range $i := until $replicas }}
+      server R{{ $i }} {{ $fullName }}-announce-{{ $i }}:{{ $root.Values.redis.port }} check inter 1s fall 1 rise 1
+      {{- end }}
+    {{- end }}
+{{- end }}
+{{- end }}
+
+
+{{- define "config-haproxy_init.sh" }}
+    HAPROXY_CONF=/data/haproxy.cfg
+    cp /readonly/haproxy.cfg "$HAPROXY_CONF"
+    {{- $fullName := include "redis-ha.fullname" . }}
+    {{- $replicas := int .Values.replicas }}
+    {{- range $i := until $replicas }}
+    ANNOUNCE_IP{{ $i }}=$(getent hosts "{{ $fullName }}-announce-{{ $i }}" | awk '{ print $1 }')
+    sed -i "s/REPLACE_ANNOUNCE{{ $i }}/$ANNOUNCE_IP{{ $i }}/" "$HAPROXY_CONF"
+    {{- end }}
+{{- end }}
diff --git a/stable/redis-ha/templates/redis-ha-configmap.yaml b/stable/redis-ha/templates/redis-ha-configmap.yaml
index e2cf3e254b..d9106b6109 100644
--- a/stable/redis-ha/templates/redis-ha-configmap.yaml
+++ b/stable/redis-ha/templates/redis-ha-configmap.yaml
@@ -9,231 +9,16 @@ metadata:
     app: {{ template "redis-ha.fullname" . }}
 data:
   redis.conf: |
-{{- if .Values.redis.customConfig }}
-{{ tpl .Values.redis.customConfig . | indent 4 }}
-{{- else }}
-    dir "/data"
-    port {{ .Values.redis.port }}
-    {{- range $key, $value := .Values.redis.config }}
-    {{ $key }} {{ $value }}
-    {{- end }}
-{{- if .Values.auth }}
-    requirepass replace-default-auth
-    masterauth replace-default-auth
-{{- end }}
-{{- end }}
+{{- include "config-redis.conf" . }}
 
   sentinel.conf: |
-{{- if .Values.sentinel.customConfig }}
-{{ tpl .Values.sentinel.customConfig . | indent 4 }}
-{{- else }}
-    dir "/data"
-    {{- $root := . -}}
-    {{- range $key, $value := .Values.sentinel.config }}
-    sentinel {{ $key }} {{ $root.Values.redis.masterGroupName }} {{ $value }}
-    {{- end }}
-{{- if .Values.auth }}
-    sentinel auth-pass {{ .Values.redis.masterGroupName }} replace-default-auth
-{{- end }}
-{{- end }}
+{{- include "config-sentinel.conf" . }}
 
   init.sh: |
-    HOSTNAME="$(hostname)"
-    INDEX="${HOSTNAME##*-}"
-    MASTER="$(redis-cli -h {{ template "redis-ha.fullname" . }} -p {{ .Values.sentinel.port }} sentinel get-master-addr-by-name {{ .Values.redis.masterGroupName }} | grep -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')"
-    MASTER_GROUP="{{ .Values.redis.masterGroupName }}"
-    QUORUM="{{ .Values.sentinel.quorum }}"
-    REDIS_CONF=/data/conf/redis.conf
-    REDIS_PORT={{ .Values.redis.port }}
-    SENTINEL_CONF=/data/conf/sentinel.conf
-    SENTINEL_PORT={{ .Values.sentinel.port }}
-    SERVICE={{ template "redis-ha.fullname" . }}
-    set -eu
-
-    sentinel_update() {
-        echo "Updating sentinel config with master $MASTER"
-        eval MY_SENTINEL_ID="\${SENTINEL_ID_$INDEX}"
-        sed -i "1s/^/sentinel myid $MY_SENTINEL_ID\\n/" "$SENTINEL_CONF"
-        sed -i "2s/^/sentinel monitor $MASTER_GROUP $1 $REDIS_PORT $QUORUM \\n/" "$SENTINEL_CONF"
-        echo "sentinel announce-ip $ANNOUNCE_IP" >> $SENTINEL_CONF
-        echo "sentinel announce-port $SENTINEL_PORT" >> $SENTINEL_CONF
-    }
-
-    redis_update() {
-        echo "Updating redis config"
-        echo "slaveof $1 $REDIS_PORT" >> "$REDIS_CONF"
-        echo "slave-announce-ip $ANNOUNCE_IP" >> $REDIS_CONF
-        echo "slave-announce-port $REDIS_PORT" >> $REDIS_CONF
-    }
-
-    copy_config() {
-        cp /readonly-config/redis.conf "$REDIS_CONF"
-        cp /readonly-config/sentinel.conf "$SENTINEL_CONF"
-    }
-
-    setup_defaults() {
-        echo "Setting up defaults"
-        if [ "$INDEX" = "0" ]; then
-            echo "Setting this pod as the default master"
-            redis_update "$ANNOUNCE_IP"
-            sentinel_update "$ANNOUNCE_IP"
-            sed -i "s/^.*slaveof.*//" "$REDIS_CONF"
-        else
-            DEFAULT_MASTER="$(getent hosts "$SERVICE-announce-0" | awk '{ print $1 }')"
-            if [ -z "$DEFAULT_MASTER" ]; then
-                echo "Unable to resolve host"
-                exit 1
-            fi
-            echo "Setting default slave config.."
-            redis_update "$DEFAULT_MASTER"
-            sentinel_update "$DEFAULT_MASTER"
-        fi
-    }
-
-    find_master() {
-        echo "Attempting to find master"
-        if [ "$(redis-cli -h "$MASTER"{{ if .Values.auth }} -a "$AUTH"{{ end }} ping)" != "PONG" ]; then
-           echo "Can't ping master, attempting to force failover"
-           if redis-cli -h "$SERVICE" -p "$SENTINEL_PORT" sentinel failover "$MASTER_GROUP" | grep -q 'NOGOODSLAVE' ; then 
-               setup_defaults
-               return 0
-           fi
-           sleep 10
-           MASTER="$(redis-cli -h $SERVICE -p $SENTINEL_PORT sentinel get-master-addr-by-name $MASTER_GROUP | grep -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')"
-           if [ "$MASTER" ]; then
-               sentinel_update "$MASTER"
-               redis_update "$MASTER"
-           else
-              echo "Could not failover, exiting..."
-              exit 1
-           fi
-        else
-            echo "Found reachable master, updating config"
-            sentinel_update "$MASTER"
-            redis_update "$MASTER"
-        fi
-    }
-
-    mkdir -p /data/conf/
-
-    echo "Initializing config.."
-    copy_config
-
-    ANNOUNCE_IP=$(getent hosts "$SERVICE-announce-$INDEX" | awk '{ print $1 }')
-    if [ -z "$ANNOUNCE_IP" ]; then
-        "Could not resolve the announce ip for this pod"
-        exit 1
-    elif [ "$MASTER" ]; then
-        find_master
-    else
-        setup_defaults
-    fi
-
-    if [ "${AUTH:-}" ]; then
-        echo "Setting auth values"
-        ESCAPED_AUTH=$(echo "$AUTH" | sed -e 's/[\/&]/\\&/g');
-        sed -i "s/replace-default-auth/${ESCAPED_AUTH}/" "$REDIS_CONF" "$SENTINEL_CONF"
-    fi
-
-    echo "Ready..."
+{{- include "config-init.sh" . }}
 {{ if .Values.haproxy.enabled }}
   haproxy.cfg: |-
-{{- if .Values.haproxy.customConfig }}
-{{ .Values.haproxy.customConfig | indent 4}}
-{{- else }}
-    defaults REDIS
-      mode tcp
-      timeout connect  {{ .Values.haproxy.timeout.connect }}
-      timeout server  {{ .Values.haproxy.timeout.server }}
-      timeout client  {{ .Values.haproxy.timeout.client }}
-
-    listen health_check_http_url
-      bind :8888
-      mode http
-      monitor-uri /healthz
-      option      dontlognull
-
-    {{- $root := . }}
-    {{- $fullName := include "redis-ha.fullname" . }}
-    {{- $replicas := int .Values.replicas }}
-    {{- range $i := until $replicas }}
-    # Check Sentinel and whether they are nominated master
-    backend check_if_redis_is_master_{{ $i }}
-      mode tcp
-      option tcp-check
-      tcp-check connect
-      {{- if $root.auth }}
-      tcp-check send AUTH\ {{ $root.redisPassword }}\r\n
-      tcp-check expect string +OK
-      {{- end }}
-      tcp-check send PING\r\n
-      tcp-check expect string +PONG
-      tcp-check send SENTINEL\ get-master-addr-by-name\ mymaster\r\n
-      tcp-check expect string REPLACE_ANNOUNCE{{ $i }}
-      tcp-check send QUIT\r\n
-      tcp-check expect string +OK
-      {{- range $i := until $replicas }}
-      server R{{ $i }} {{ $fullName }}-announce-{{ $i }}:26379 check inter 1s
-      {{- end }}
-    {{- end }}
-
-    # decide redis backend to use
-    #master
-    frontend ft_redis_master
-      bind *:{{ $root.Values.redis.port }}
-      use_backend bk_redis_master
-    {{ if .Values.haproxy.readOnly.enabled }}
-    #slave
-    frontend ft_redis_slave
-      bind *:{{ .Values.haproxy.readOnly.port }}
-      use_backend bk_redis_slave
-    {{- end }} 
-    # Check all redis servers to see if they think they are master
-    backend bk_redis_master
-      mode tcp
-      option tcp-check
-      tcp-check connect
-      {{- if .Values.auth }}
-      tcp-check send AUTH\ {{ .Values.redisPassword }}\r\n
-      tcp-check expect string +OK
-      {{- end }}
-      tcp-check send PING\r\n
-      tcp-check expect string +PONG
-      tcp-check send info\ replication\r\n
-      tcp-check expect string role:master
-      tcp-check send QUIT\r\n
-      tcp-check expect string +OK
-      {{- range $i := until $replicas }}
-      use-server R{{ $i }} if { srv_is_up(R{{ $i }}) } { nbsrv(check_if_redis_is_master_{{ $i }}) ge 2 }
-      server R{{ $i }} {{ $fullName }}-announce-{{ $i }}:{{ $root.Values.redis.port }} check inter 1s fall 1 rise 1
-      {{- end }}     
-    {{ if .Values.haproxy.readOnly.enabled }}
-    backend bk_redis_slave
-      mode tcp
-      option tcp-check
-      tcp-check connect
-      {{- if .Values.auth }}
-      tcp-check send AUTH\ {{ .Values.redisPassword }}\r\n
-      tcp-check expect string +OK
-      {{- end }}
-      tcp-check send PING\r\n
-      tcp-check expect string +PONG
-      tcp-check send info\ replication\r\n
-      tcp-check expect  string role:slave
-      tcp-check send QUIT\r\n
-      tcp-check expect string +OK
-      {{- range $i := until $replicas }}
-      server R{{ $i }} {{ $fullName }}-announce-{{ $i }}:{{ $root.Values.redis.port }} check inter 1s fall 1 rise 1
-      {{- end }}
-    {{- end }}
+{{- include "config-haproxy.cfg" . }}
 {{- end }}
-{{- end }}
-  haproxy_init.sh: | 
-    HAPROXY_CONF=/data/haproxy.cfg
-    cp /readonly/haproxy.cfg "$HAPROXY_CONF"
-    {{- $fullName := include "redis-ha.fullname" . }}
-    {{- $replicas := int .Values.replicas }}
-    {{- range $i := until $replicas }}
-    ANNOUNCE_IP{{ $i }}=$(getent hosts "{{ $fullName }}-announce-{{ $i }}" | awk '{ print $1 }')
-    sed -i "s/REPLACE_ANNOUNCE{{ $i }}/$ANNOUNCE_IP{{ $i }}/" "$HAPROXY_CONF"
-    {{- end }}
+  haproxy_init.sh: |
+{{- include "config-haproxy_init.sh" . }}
diff --git a/stable/redis-ha/templates/redis-ha-statefulset.yaml b/stable/redis-ha/templates/redis-ha-statefulset.yaml
index 4875c46d6f..f71f780157 100644
--- a/stable/redis-ha/templates/redis-ha-statefulset.yaml
+++ b/stable/redis-ha/templates/redis-ha-statefulset.yaml
@@ -17,7 +17,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/init-config: {{ include (print $.Template.BasePath "/redis-ha-configmap.yaml") . | sha256sum }}
+        checksum/init-config: {{ print (include "config-redis.conf" .) (include "config-init.sh" .) | sha256sum }}
       {{- if .Values.podAnnotations }}
 {{ toYaml .Values.podAnnotations | indent 8 }}
       {{- end }}
diff --git a/stable/redis-ha/templates/redis-haproxy-deployment.yaml b/stable/redis-ha/templates/redis-haproxy-deployment.yaml
index 6501d10b6b..b3ec48f6ff 100644
--- a/stable/redis-ha/templates/redis-haproxy-deployment.yaml
+++ b/stable/redis-ha/templates/redis-haproxy-deployment.yaml
@@ -24,7 +24,7 @@ spec:
         prometheus.io/path: /metrics
         prometheus.io/port: "9101"
         prometheus.io/scrape: "true"
-        checksum/config: {{ include (print $.Template.BasePath "/redis-ha-configmap.yaml") . | sha256sum }}
+        checksum/config: {{ print (include "config-haproxy.cfg" .) (include "config-haproxy_init.sh" .) | sha256sum }}
       {{- if .Values.haproxy.annotations }}
 {{ toYaml .Values.haproxy.annotations | indent 8 }}
       {{- end }}