diff --git a/stable/etcd-operator/Chart.yaml b/stable/etcd-operator/Chart.yaml
index 7ba7496f82..7b54592d18 100755
--- a/stable/etcd-operator/Chart.yaml
+++ b/stable/etcd-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: CoreOS etcd-operator Helm chart for Kubernetes
 name: etcd-operator
-version: 0.7.2
+version: 0.7.3
 appVersion: 0.7.0
 home: https://github.com/coreos/etcd-operator
 icon: https://raw.githubusercontent.com/coreos/etcd/master/logos/etcd-horizontal-color.png
diff --git a/stable/etcd-operator/templates/backup-operator-deployment.yaml b/stable/etcd-operator/templates/backup-operator-deployment.yaml
index 7e4c345b79..768229cec3 100644
--- a/stable/etcd-operator/templates/backup-operator-deployment.yaml
+++ b/stable/etcd-operator/templates/backup-operator-deployment.yaml
@@ -24,7 +24,7 @@ spec:
         image: "{{ .Values.backupOperator.image.repository }}:{{ .Values.backupOperator.image.tag }}"
         imagePullPolicy: {{ .Values.backupOperator.image.pullPolicy }}
         command:
-         - etcd-backup-operator
+        - etcd-backup-operator
 {{- range $key, $value := .Values.backupOperator.commandArgs }}
         - "--{{ $key }}={{ $value }}"
 {{- end }}
@@ -48,4 +48,8 @@ spec:
       nodeSelector:
 {{ toYaml .Values.backupOperator.nodeSelector | indent 8 }}
     {{- end }}
-{{- end}}
\ No newline at end of file
+    {{- if .Values.backupOperator.tolerations }}
+      tolerations:
+{{ toYaml .Values.backupOperator.tolerations | indent 8 }}
+    {{- end }}
+{{- end }}
diff --git a/stable/etcd-operator/templates/operator-deployment.yaml b/stable/etcd-operator/templates/operator-deployment.yaml
index 4401747d6f..5935bf221d 100644
--- a/stable/etcd-operator/templates/operator-deployment.yaml
+++ b/stable/etcd-operator/templates/operator-deployment.yaml
@@ -24,7 +24,7 @@ spec:
         image: "{{ .Values.etcdOperator.image.repository }}:{{ .Values.etcdOperator.image.tag }}"
         imagePullPolicy: {{ .Values.etcdOperator.image.pullPolicy }}
         command:
-         - etcd-operator
+        - etcd-operator
 {{- range $key, $value := .Values.etcdOperator.commandArgs }}
         - "--{{ $key }}={{ $value }}"
 {{- end }}
@@ -48,4 +48,8 @@ spec:
       nodeSelector:
 {{ toYaml .Values.etcdOperator.nodeSelector | indent 8 }}
     {{- end }}
+    {{- if .Values.etcdOperator.tolerations }}
+      tolerations:
+{{ toYaml .Values.etcdOperator.tolerations | indent 8 }}
+    {{- end }}
 {{- end }}
diff --git a/stable/etcd-operator/templates/restore-operator-deployment.yaml b/stable/etcd-operator/templates/restore-operator-deployment.yaml
index 41769250b0..15bb292d73 100644
--- a/stable/etcd-operator/templates/restore-operator-deployment.yaml
+++ b/stable/etcd-operator/templates/restore-operator-deployment.yaml
@@ -15,7 +15,7 @@ spec:
     metadata:
       name: {{ template "etcd-restore-operator.fullname" . }}
       labels:
-        app: {{ template "etcd-restore-operator.fullname" . }}
+        app: {{ template "etcd-restore-operator.name" . }}
         release: {{ .Release.Name }}
     spec:
       serviceAccountName: {{ template "etcd-restore-operator.serviceAccountName" . }}
@@ -26,7 +26,7 @@ spec:
         ports:
         - containerPort: {{ .Values.restoreOperator.port }}
         command:
-         - etcd-restore-operator
+        - etcd-restore-operator
 {{- range $key, $value := .Values.restoreOperator.commandArgs }}
         - "--{{ $key }}={{ $value }}"
 {{- end }}
@@ -52,4 +52,8 @@ spec:
       nodeSelector:
 {{ toYaml .Values.restoreOperator.nodeSelector | indent 8 }}
     {{- end }}
-{{- end}}
\ No newline at end of file
+    {{- if .Values.restoreOperator.tolerations }}
+      tolerations:
+{{ toYaml .Values.restoreOperator.tolerations | indent 8 }}
+    {{- end }}
+{{- end }}
diff --git a/stable/etcd-operator/templates/restore-operator-service.yaml b/stable/etcd-operator/templates/restore-operator-service.yaml
index c05d912520..052be36476 100644
--- a/stable/etcd-operator/templates/restore-operator-service.yaml
+++ b/stable/etcd-operator/templates/restore-operator-service.yaml
@@ -17,4 +17,4 @@ spec:
   selector:
     app: {{ template "etcd-restore-operator.name" . }}
     release: {{ .Release.Name }}
-{{- end}}
\ No newline at end of file
+{{- end }}