diff --git a/incubator/etcd/templates/etcd-statefulset.yaml b/incubator/etcd/templates/etcd-statefulset.yaml
index 72210780c37a..459358cb96b7 100644
--- a/incubator/etcd/templates/etcd-statefulset.yaml
+++ b/incubator/etcd/templates/etcd-statefulset.yaml
@@ -1,25 +1,3 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
-metadata:
-  name: {{ template "etcd.fullname" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    component: "{{ .Release.Name }}-{{ .Values.Component }}"
-spec:
-  ports:
-  - port: {{ .Values.PeerPort }}
-    name: etcd-server
-  - port: {{ .Values.ClientPort }}
-    name: etcd-client
-  clusterIP: None
-  selector:
-    component: "{{ .Release.Name }}-{{ .Values.Component }}"
----
 apiVersion: apps/v1beta1
 kind: StatefulSet
 metadata:
diff --git a/incubator/etcd/templates/service.yaml b/incubator/etcd/templates/service.yaml
new file mode 100644
index 000000000000..fb78655b9052
--- /dev/null
+++ b/incubator/etcd/templates/service.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+metadata:
+  name: {{ template "etcd.fullname" . }}
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    component: "{{ .Release.Name }}-{{ .Values.Component }}"
+spec:
+  ports:
+  - port: {{ .Values.PeerPort }}
+    name: etcd-server
+  - port: {{ .Values.ClientPort }}
+    name: etcd-client
+  clusterIP: None
+  selector:
+    component: "{{ .Release.Name }}-{{ .Values.Component }}"