diff --git a/incubator/etcd/Chart.yaml b/incubator/etcd/Chart.yaml
index 299ba32ce8..771d714b6a 100755
--- a/incubator/etcd/Chart.yaml
+++ b/incubator/etcd/Chart.yaml
@@ -1,6 +1,6 @@
 name: etcd
 home: https://github.com/coreos/etcd
-version: 0.2.1
+version: 0.2.2
 description: Distributed reliable key-value store for the most critical data of a distributed system.
 icon: https://raw.githubusercontent.com/coreos/etcd/master/logos/etcd-horizontal-color.png
 sources:
diff --git a/incubator/etcd/templates/_helpers.tpl b/incubator/etcd/templates/_helpers.tpl
new file mode 100644
index 0000000000..c6b07b5c07
--- /dev/null
+++ b/incubator/etcd/templates/_helpers.tpl
@@ -0,0 +1,10 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 64 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 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/incubator/etcd/templates/etcd-statefulset.yaml b/incubator/etcd/templates/etcd-statefulset.yaml
index 549cc3484c..29c2b10f01 100644
--- a/incubator/etcd/templates/etcd-statefulset.yaml
+++ b/incubator/etcd/templates/etcd-statefulset.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 metadata:
-  name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}"
+  name: {{ template "fullname" . }}
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
@@ -23,18 +23,18 @@ spec:
 apiVersion: apps/v1beta1
 kind: StatefulSet
 metadata:
-  name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}"
+  name: {{ template "fullname" . }}
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: "{{ .Release.Name }}-{{ .Values.Component }}"
 spec:
-  serviceName: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}"
+  serviceName: {{ template "fullname" . }}
   replicas: {{ default 3 .Values.Replicas }}
   template:
     metadata:
-      name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}"
+      name: {{ template "fullname" . }}
       labels:
         heritage: {{ .Release.Service | quote }}
         release: {{ .Release.Name | quote }}
@@ -44,7 +44,7 @@ spec:
         pod.alpha.kubernetes.io/initialized: "true"
     spec:
       containers:
-      - name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}"
+      - name: {{ template "fullname" . }}
         image: "{{ .Values.Image }}:{{ .Values.ImageTag }}"
         imagePullPolicy: "{{ .Values.ImagePullPolicy }}"
         ports:
@@ -60,7 +60,7 @@ spec:
         - name: INITIAL_CLUSTER_SIZE
           value: {{ default 3 .Values.Replicas | quote }}
         - name: SET_NAME
-          value: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}"
+          value: {{ template "fullname" . }}
         volumeMounts:
         - name: datadir
           mountPath: /var/run/etcd