diff --git a/pkg/operator/bootstrap.go b/pkg/operator/bootstrap.go
index 29312d784c..6cc8ba0054 100644
--- a/pkg/operator/bootstrap.go
+++ b/pkg/operator/bootstrap.go
@@ -112,7 +112,7 @@ func RenderBootstrap(
 	spec.OSImageURL = imgs.MachineOSContent
 	spec.Images = map[string]string{
 		templatectrl.EtcdImageKey:            imgs.Etcd,
-		templatectrl.SetupEtcdEnvKey:         imgs.SetupEtcdEnv,
+		templatectrl.SetupEtcdEnvKey:         imgs.MachineConfigOperator,
 		templatectrl.InfraImageKey:           imgs.InfraImage,
 		templatectrl.KubeClientAgentImageKey: imgs.KubeClientAgent,
 	}
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
index ccbbe1e21b..8234197524 100644
--- a/pkg/operator/operator.go
+++ b/pkg/operator/operator.go
@@ -406,7 +406,7 @@ func (optr *Operator) sync(key string) error {
 	spec.OSImageURL = imgs.MachineOSContent
 	spec.Images = map[string]string{
 		templatectrl.EtcdImageKey:            imgs.Etcd,
-		templatectrl.SetupEtcdEnvKey:         imgs.SetupEtcdEnv,
+		templatectrl.SetupEtcdEnvKey:         imgs.MachineConfigOperator,
 		templatectrl.InfraImageKey:           imgs.InfraImage,
 		templatectrl.KubeClientAgentImageKey: imgs.KubeClientAgent,
 	}
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 22b35eff41..2f8b894539 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
@@ -14,6 +14,7 @@ contents:
       initContainers:
       - name: discovery
         image: "{{.Images.setupEtcdEnv}}"
+        command: ["/usr/bin/setup-etcd-environment"]
         args:
         - "run"
         - "--discovery-srv={{.EtcdDiscoveryDomain}}"