diff --git a/templates/master/00-master/_base/files/etc-kubernetes-manifests-etcd-member.yaml b/templates/master/00-master/_base/files/etc-kubernetes-manifests-etcd-member.yaml
index a57975070e..39c6e9b6e8 100644
--- a/templates/master/00-master/_base/files/etc-kubernetes-manifests-etcd-member.yaml
+++ b/templates/master/00-master/_base/files/etc-kubernetes-manifests-etcd-member.yaml
@@ -12,6 +12,18 @@ contents:
         k8s-app: etcd
     spec:
       initContainers:
+    {{if .Images.clusterEtcdOperatorImageKey}}
+      - name: wait-for-kube
+        image: "{{.Images.clusterEtcdOperatorImageKey}}"
+        command: ["/usr/bin/cluster-etcd-operator"]
+        args:
+        - "wait-for-kube"
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - name: sa
+          mountPath: /var/run/secrets/kubernetes.io/serviceaccount/
+    {{end}}
       - name: discovery
         image: "{{.Images.setupEtcdEnvKey}}"
         command: ["/usr/bin/setup-etcd-environment"]