diff --git a/cmd/machine-config-operator/bootstrap.go b/cmd/machine-config-operator/bootstrap.go
index 8b66c89db1..1837ffd6f2 100644
--- a/cmd/machine-config-operator/bootstrap.go
+++ b/cmd/machine-config-operator/bootstrap.go
@@ -24,24 +24,25 @@ var (
 	}
 
 	bootstrapOpts struct {
+		cloudConfigFile      string
+		configFile           string
+		destinationDir       string
 		etcdCAFile           string
+		etcdImage            string
 		etcdMetricCAFile     string
-		rootCAFile           string
-		kubeCAFile           string
-		pullSecretFile       string
-		configFile           string
-		oscontentImage       string
-		infraConfigFile      string
-		networkConfigFile    string
 		imagesConfigMapFile  string
+		infraConfigFile      string
+		infraImage           string
+		kubeCAFile           string
+		kubeClientAgentImage string
 		mccImage             string
-		mcsImage             string
 		mcdImage             string
-		etcdImage            string
+		mcsImage             string
+		networkConfigFile    string
+		oscontentImage       string
+		pullSecretFile       string
+		rootCAFile           string
 		setupEtcdEnvImage    string
-		infraImage           string
-		kubeClientAgentImage string
-		destinationDir       string
 	}
 )
 
@@ -74,6 +75,7 @@ func init() {
 	bootstrapCmd.MarkFlagRequired("config-file")
 	bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.infraConfigFile, "infra-config-file", "/assets/manifests/cluster-infrastructure-02-config.yml", "File containing infrastructure.config.openshift.io manifest.")
 	bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.networkConfigFile, "network-config-file", "/assets/manifests/cluster-network-02-config.yml", "File containing network.config.openshift.io manifest.")
+	bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.cloudConfigFile, "cloud-config-file", "", "File containing the config map that contains the cloud config for cloudprovider.")
 }
 
 func runBootstrapCmd(cmd *cobra.Command, args []string) {
@@ -97,6 +99,7 @@ func runBootstrapCmd(cmd *cobra.Command, args []string) {
 	if err := operator.RenderBootstrap(
 		bootstrapOpts.configFile,
 		bootstrapOpts.infraConfigFile, bootstrapOpts.networkConfigFile,
+		bootstrapOpts.cloudConfigFile,
 		bootstrapOpts.etcdCAFile, bootstrapOpts.etcdMetricCAFile, bootstrapOpts.rootCAFile, bootstrapOpts.kubeCAFile, bootstrapOpts.pullSecretFile,
 		imgs,
 		bootstrapOpts.destinationDir,
diff --git a/pkg/controller/template/render.go b/pkg/controller/template/render.go
index 58977ad0f7..6377fafd9f 100644
--- a/pkg/controller/template/render.go
+++ b/pkg/controller/template/render.go
@@ -298,6 +298,7 @@ func renderTemplate(config RenderConfig, path string, b []byte) ([]byte, error)
 	funcs["etcdServerCertDNSNames"] = etcdServerCertDNSNames
 	funcs["etcdPeerCertDNSNames"] = etcdPeerCertDNSNames
 	funcs["cloudProvider"] = cloudProvider
+	funcs["cloudConfigFlag"] = cloudConfigFlag
 	tmpl, err := template.New(path).Funcs(funcs).Parse(string(b))
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse template %s: %v", path, err)
@@ -361,6 +362,19 @@ func cloudProvider(cfg RenderConfig) (interface{}, error) {
 	return "", nil
 }
 
+// Process the {{cloudConfigFlag .}}
+// If the CloudProviderConfig field is set and not empty, this
+// returns the cloud conf flag for kubelet [1] pointing the kubelet to use
+// /etc/kubernetes/cloud.conf for configuring the cloud provider.
+//
+// [1]: https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/#options
+func cloudConfigFlag(cfg RenderConfig) interface{} {
+	if len(cfg.CloudProviderConfig) > 0 {
+		return "--cloud-config=/etc/kubernetes/cloud.conf"
+	}
+	return ""
+}
+
 // existsDir returns true if path exists and is a directory, false if the path
 // does not exist, and error if there is a runtime error or the path is not a directory
 func existsDir(path string) (bool, error) {
diff --git a/pkg/controller/template/test_data/controller_config_openstack.yaml b/pkg/controller/template/test_data/controller_config_openstack.yaml
index c706e9da69..4bcc704152 100644
--- a/pkg/controller/template/test_data/controller_config_openstack.yaml
+++ b/pkg/controller/template/test_data/controller_config_openstack.yaml
@@ -2,7 +2,11 @@ apiVersion: "machineconfigurations.openshift.io/v1"
 kind: "ControllerConfig"
 spec:
   clusterDNSIP: "10.3.0.10"
-  cloudProviderConfig: ""
+  cloudProviderConfig: |
+    testing
+    multi-line cloud config
+    [test]
+      option = dummy
   etcdDiscoveryDomain: "my-test-cluster.installer.team.coreos.systems"
   etcdInitialCount: 3
   platform: "openstack"
diff --git a/pkg/controller/template/test_data/controller_config_vsphere.yaml b/pkg/controller/template/test_data/controller_config_vsphere.yaml
index 8de74d94e3..122ce6dc01 100644
--- a/pkg/controller/template/test_data/controller_config_vsphere.yaml
+++ b/pkg/controller/template/test_data/controller_config_vsphere.yaml
@@ -2,7 +2,11 @@ apiVersion: "machineconfigurations.openshift.io/v1"
 kind: "ControllerConfig"
 spec:
   clusterDNSIP: "10.3.0.10"
-  cloudProviderConfig: ""
+  cloudProviderConfig: |
+    testing
+    multi-line cloud config
+    [test]
+      option = dummy
   etcdDiscoveryDomain: "my-test-cluster.installer.team.coreos.systems"
   etcdInitialCount: 3
   platform: "vsphere"
diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-ca.crt
deleted file mode 100644
index 93e18c9420..0000000000
--- a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20root-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/ca.crt
diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-kubelet.conf
deleted file mode 100644
index 9cdc597762..0000000000
--- a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-kubelet.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,kind%3A%20KubeletConfiguration%0AapiVersion%3A%20kubelet.config.k8s.io%2Fv1beta1%0AcgroupDriver%3A%20systemd%0AclusterDNS%3A%0A%20%20-%2010.3.0.10%0AclusterDomain%3A%20cluster.local%0AmaxPods%3A%20250%0AruntimeRequestTimeout%3A%2010m%0AserializeImagePulls%3A%20false%0AstaticPodPath%3A%20%2Fetc%2Fkubernetes%2Fmanifests%0AsystemReserved%3A%0A%20%20cpu%3A%20500m%0A%20%20memory%3A%20500Mi%0AfeatureGates%3A%0A%20%20RotateKubeletServerCertificate%3A%20true%0AserverTLSBootstrap%3A%20true%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/kubelet.conf
diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-manifests-etcd-member.yaml b/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-manifests-etcd-member.yaml
deleted file mode 100644
index 978589f9df..0000000000
--- a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-manifests-etcd-member.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,apiVersion%3A%20v1%0Akind%3A%20Pod%0Ametadata%3A%0A%20%20name%3A%20etcd-member%0A%20%20namespace%3A%20openshift-etcd%0A%20%20labels%3A%0A%20%20%20%20k8s-app%3A%20etcd%0Aspec%3A%0A%20%20initContainers%3A%0A%20%20-%20name%3A%20discovery%0A%20%20%20%20image%3A%20%22registry.svc.ci.openshift.org%2Fopenshift%2Forigin-v4.0%3Asetup-etcd-environment%22%0A%20%20%20%20args%3A%0A%20%20%20%20-%20%22run%22%0A%20%20%20%20-%20%22--discovery-srv%3Dmy-test-cluster.installer.team.coreos.systems%22%0A%20%20%20%20-%20%22--output-file%3D%2Frun%2Fetcd%2Fenvironment%22%0A%20%20%20%20-%20%22--v%3D4%22%0A%20%20%20%20securityContext%3A%0A%20%20%20%20%20%20priviledged%3A%20true%0A%20%20%20%20volumeMounts%3A%0A%20%20%20%20-%20name%3A%20discovery%0A%20%20%20%20%20%20mountPath%3A%20%2Frun%2Fetcd%2F%0A%20%20-%20name%3A%20certs%0A%20%20%20%20image%3A%20%22quay.io%2Fcoreos%2Fkube-client-agent%3A36c62ccd7b16b522450c61e96fc556b217ee24f5%22%20%23%23%20FIXME(abhinav)%3A%20these%20images%20should%20be%20replacable%20by%20release%20image.%0A%20%20%20%20command%3A%0A%20%20%20%20-%20%2Fbin%2Fsh%0A%20%20%20%20-%20-c%0A%20%20%20%20-%20%7C%0A%20%20%20%20%20%20%23!%2Fbin%2Fsh%0A%20%20%20%20%20%20set%20-euo%20pipefail%0A%0A%20%20%20%20%20%20source%20%2Frun%2Fetcd%2Fenvironment%0A%0A%20%20%20%20%20%20%5B%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.crt%20-a%20%5C%0A%20%20%20%20%20%20%20%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.key%20%5D%20%7C%7C%20%5C%0A%20%20%20%20%20%20%20%20%2Fusr%2Flocal%2Fbin%2Fkube-client-agent%20%5C%0A%20%20%20%20%20%20%20%20%20%20request%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--kubeconfig%3D%2Fetc%2Fkubernetes%2Fkubeconfig%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--orgname%3Dsystem%3Aetcd-servers%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--assetsdir%3D%2Fetc%2Fssl%2Fetcd%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--dnsnames%3Dlocalhost%2Cetcd.kube-system.svc%2Cetcd.kube-system.svc.cluster.local%2Cetcd.openshift-etcd.svc%2Cetcd.openshift-etcd.svc.cluster.local%2C%24%7BETCD_DNS_NAME%7D%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--commonname%3Dsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--ipaddrs%3D%24%7BETCD_IPV4_ADDRESS%7D%2C127.0.0.1%20%5C%0A%0A%20%20%20%20%20%20%5B%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.crt%20-a%20%5C%0A%20%20%20%20%20%20%20%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.key%20%5D%20%7C%7C%20%5C%0A%20%20%20%20%20%20%20%20%2Fusr%2Flocal%2Fbin%2Fkube-client-agent%20%5C%0A%20%20%20%20%20%20%20%20%20%20request%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--kubeconfig%3D%2Fetc%2Fkubernetes%2Fkubeconfig%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--orgname%3Dsystem%3Aetcd-peers%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--assetsdir%3D%2Fetc%2Fssl%2Fetcd%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--dnsnames%3D%24%7BETCD_DNS_NAME%7D%2Cmy-test-cluster.installer.team.coreos.systems%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--commonname%3Dsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--ipaddrs%3D%24%7BETCD_IPV4_ADDRESS%7D%20%5C%0A%20%20%20%20%20%20%0A%20%20%20%20securityContext%3A%0A%20%20%20%20%20%20priviledged%3A%20true%0A%20%20%20%20volumeMounts%3A%0A%20%20%20%20-%20name%3A%20discovery%0A%20%20%20%20%20%20mountPath%3A%20%2Frun%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20certs%0A%20%20%20%20%20%20mountPath%3A%20%2Fetc%2Fssl%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20kubeconfig%0A%20%20%20%20%20%20mountPath%3A%20%2Fetc%2Fkubernetes%2Fkubeconfig%0A%20%20containers%3A%0A%20%20-%20name%3A%20etcd-member%0A%20%20%20%20image%3A%20%22quay.io%2Fcoreos%2Fetcd%3Av3.3.10%22%20%23%23%20FIXME(abhinav)%3A%20these%20images%20should%20be%20replacable%20by%20release%20image.%0A%20%20%20%20command%3A%0A%20%20%20%20-%20%2Fbin%2Fsh%0A%20%20%20%20-%20-c%0A%20%20%20%20-%20%7C%0A%20%20%20%20%20%20%23!%2Fbin%2Fsh%0A%20%20%20%20%20%20set%20-euo%20pipefail%0A%0A%20%20%20%20%20%20source%20%2Frun%2Fetcd%2Fenvironment%0A%0A%20%20%20%20%20%20%2Fusr%2Flocal%2Fbin%2Fetcd%20%5C%0A%20%20%20%20%20%20%20%20--discovery-srv%20my-test-cluster.installer.team.coreos.systems%20%5C%0A%20%20%20%20%20%20%20%20--initial-advertise-peer-urls%3Dhttps%3A%2F%2F%24%7BETCD_IPV4_ADDRESS%7D%3A2380%20%5C%0A%20%20%20%20%20%20%20%20--cert-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.crt%20%5C%0A%20%20%20%20%20%20%20%20--key-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.key%20%5C%0A%20%20%20%20%20%20%20%20--trusted-ca-file%3D%2Fetc%2Fssl%2Fetcd%2Fca.crt%20%5C%0A%20%20%20%20%20%20%20%20--client-cert-auth%3Dtrue%20%5C%0A%20%20%20%20%20%20%20%20--peer-cert-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.crt%20%5C%0A%20%20%20%20%20%20%20%20--peer-key-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.key%20%5C%0A%20%20%20%20%20%20%20%20--peer-trusted-ca-file%3D%2Fetc%2Fssl%2Fetcd%2Fca.crt%20%5C%0A%20%20%20%20%20%20%20%20--peer-client-cert-auth%3Dtrue%20%5C%0A%20%20%20%20%20%20%20%20--advertise-client-urls%3Dhttps%3A%2F%2F%24%7BETCD_IPV4_ADDRESS%7D%3A2379%20%5C%0A%20%20%20%20%20%20%20%20--listen-client-urls%3Dhttps%3A%2F%2F0.0.0.0%3A2379%20%5C%0A%20%20%20%20%20%20%20%20--listen-peer-urls%3Dhttps%3A%2F%2F0.0.0.0%3A2380%20%5C%0A%20%20%20%20securityContext%3A%0A%20%20%20%20%20%20priviledged%3A%20true%0A%20%20%20%20volumeMounts%3A%0A%20%20%20%20-%20name%3A%20discovery%0A%20%20%20%20%20%20mountPath%3A%20%2Frun%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20certs%0A%20%20%20%20%20%20mountPath%3A%20%2Fetc%2Fssl%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20data-dir%0A%20%20%20%20%20%20mountPath%3A%20%2Fvar%2Flib%2Fetcd%2F%0A%20%20%20%20env%3A%0A%20%20%20%20-%20name%3A%20ETCD_DATA_DIR%0A%20%20%20%20%20%20value%3A%20%22%2Fvar%2Flib%2Fetcd%22%0A%20%20%20%20-%20name%3A%20ETCD_NAME%0A%20%20%20%20%20%20valueFrom%3A%0A%20%20%20%20%20%20%20%20fieldRef%3A%0A%20%20%20%20%20%20%20%20%20%20fieldPath%3A%20metadata.name%0A%20%20%20%20ports%3A%0A%20%20%20%20-%20name%3A%20peer%0A%20%20%20%20%20%20containerPort%3A%202380%0A%20%20%20%20%20%20protocol%3A%20TCP%0A%20%20%20%20-%20name%3A%20server%0A%20%20%20%20%20%20containerPort%3A%202379%0A%20%20%20%20%20%20protocol%3A%20TCP%0A%20%20hostNetwork%3A%20true%0A%20%20restartPolicy%3A%20Always%0A%20%20volumes%3A%0A%20%20-%20name%3A%20certs%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Fetc%2Fkubernetes%2Fstatic-pod-resources%2Fetcd-member%0A%20%20-%20name%3A%20kubeconfig%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Fetc%2Fkubernetes%2Fkubeconfig%0A%20%20-%20name%3A%20discovery%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Frun%2Fetcd%0A%20%20-%20name%3A%20data-dir%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Fvar%2Flib%2Fetcd%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/manifests/etcd-member.yaml
diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt b/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt
deleted file mode 100644
index 32bcd5d94d..0000000000
--- a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20etcd-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/static-pod-resources/etcd-member/ca.crt
diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-metric-ca.crt b/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-metric-ca.crt
deleted file mode 100644
index 2d902ae476..0000000000
--- a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-metric-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20etcd-metric-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/static-pod-resources/etcd-member/metric-ca.crt
diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt b/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt
deleted file mode 100644
index cb1bec649c..0000000000
--- a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20root-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/static-pod-resources/etcd-member/root-ca.crt
diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/aws/master/files/-etc-sysctl.d-forward.conf
deleted file mode 100644
index dc3f2dc75d..0000000000
--- a/pkg/controller/template/test_data/templates/aws/master/files/-etc-sysctl.d-forward.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,net.ipv4.ip_forward%20%3D%201%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/sysctl.d/forward.conf
diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/aws/master/files/-var-lib-kubelet-config.json
deleted file mode 100644
index 0ba6c19e6a..0000000000
--- a/pkg/controller/template/test_data/templates/aws/master/files/-var-lib-kubelet-config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,%7B%22dummy%22%3A%22dummy%22%7D%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /var/lib/kubelet/config.json
diff --git a/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service b/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service
deleted file mode 100644
index 7a55cafb88..0000000000
--- a/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service
+++ /dev/null
@@ -1,35 +0,0 @@
-contents: |
-  [Unit]
-  Description=Kubernetes Kubelet
-  Wants=rpc-statd.service
-
-  [Service]
-  Type=notify
-  ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  EnvironmentFile=-/etc/kubernetes/kubelet-workaround
-  EnvironmentFile=-/etc/kubernetes/kubelet-env
-
-  ExecStart=/usr/bin/hyperkube \
-      kubelet \
-        --config=/etc/kubernetes/kubelet.conf \
-        --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
-        --rotate-certificates \
-        --kubeconfig=/var/lib/kubelet/kubeconfig \
-        --container-runtime=remote \
-        --container-runtime-endpoint=/var/run/crio/crio.sock \
-        --allow-privileged \
-        --node-labels=node-role.kubernetes.io/master \
-        --minimum-container-ttl-duration=6m0s \
-        --client-ca-file=/etc/kubernetes/ca.crt \
-        --cloud-provider=aws \
-        \
-        --anonymous-auth=false \
-        --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
-
-  Restart=always
-  RestartSec=10
-
-  [Install]
-  WantedBy=multi-user.target
-enabled: true
-name: kubelet.service
diff --git a/pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-ca.crt
deleted file mode 100644
index 93e18c9420..0000000000
--- a/pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20root-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/ca.crt
diff --git a/pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-kubelet.conf
deleted file mode 100644
index c2b5912b8f..0000000000
--- a/pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-kubelet.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,kind%3A%20KubeletConfiguration%0AapiVersion%3A%20kubelet.config.k8s.io%2Fv1beta1%0AcgroupDriver%3A%20systemd%0AclusterDNS%3A%0A%20%20-%2010.3.0.10%0AclusterDomain%3A%20cluster.local%0AmaxPods%3A%20250%0ArotateCertificates%3A%20true%0AruntimeRequestTimeout%3A%2010m%0AserializeImagePulls%3A%20false%0AstaticPodPath%3A%20%2Fetc%2Fkubernetes%2Fmanifests%0AsystemReserved%3A%0A%20%20cpu%3A%20500m%0A%20%20memory%3A%20500Mi%0AfeatureGates%3A%0A%20%20RotateKubeletServerCertificate%3A%20true%0AserverTLSBootstrap%3A%20true%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/kubelet.conf
diff --git a/pkg/controller/template/test_data/templates/aws/worker/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/aws/worker/files/-etc-sysctl.d-forward.conf
deleted file mode 100644
index dc3f2dc75d..0000000000
--- a/pkg/controller/template/test_data/templates/aws/worker/files/-etc-sysctl.d-forward.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,net.ipv4.ip_forward%20%3D%201%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/sysctl.d/forward.conf
diff --git a/pkg/controller/template/test_data/templates/aws/worker/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/aws/worker/files/-var-lib-kubelet-config.json
deleted file mode 100644
index 0ba6c19e6a..0000000000
--- a/pkg/controller/template/test_data/templates/aws/worker/files/-var-lib-kubelet-config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,%7B%22dummy%22%3A%22dummy%22%7D%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /var/lib/kubelet/config.json
diff --git a/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service b/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service
deleted file mode 100644
index fd23ed6931..0000000000
--- a/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service
+++ /dev/null
@@ -1,33 +0,0 @@
-contents: |
-  [Unit]
-  Description=Kubernetes Kubelet
-  Wants=rpc-statd.service
-
-  [Service]
-  Type=notify
-  ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  EnvironmentFile=-/etc/kubernetes/kubelet-workaround
-  EnvironmentFile=-/etc/kubernetes/kubelet-env
-
-  ExecStart=/usr/bin/hyperkube \
-      kubelet \
-        --config=/etc/kubernetes/kubelet.conf \
-        --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
-        --kubeconfig=/var/lib/kubelet/kubeconfig \
-        --container-runtime=remote \
-        --container-runtime-endpoint=/var/run/crio/crio.sock \
-        --allow-privileged \
-        --node-labels=node-role.kubernetes.io/worker \
-        --minimum-container-ttl-duration=6m0s \
-        --client-ca-file=/etc/kubernetes/ca.crt \
-        --cloud-provider=aws \
-        \
-        --anonymous-auth=false \
-
-  Restart=always
-  RestartSec=10
-
-  [Install]
-  WantedBy=multi-user.target
-enabled: true
-name: kubelet.service
diff --git a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-ca.crt
deleted file mode 100644
index 93e18c9420..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20root-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/ca.crt
diff --git a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-kubelet.conf
deleted file mode 100644
index 9cdc597762..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-kubelet.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,kind%3A%20KubeletConfiguration%0AapiVersion%3A%20kubelet.config.k8s.io%2Fv1beta1%0AcgroupDriver%3A%20systemd%0AclusterDNS%3A%0A%20%20-%2010.3.0.10%0AclusterDomain%3A%20cluster.local%0AmaxPods%3A%20250%0AruntimeRequestTimeout%3A%2010m%0AserializeImagePulls%3A%20false%0AstaticPodPath%3A%20%2Fetc%2Fkubernetes%2Fmanifests%0AsystemReserved%3A%0A%20%20cpu%3A%20500m%0A%20%20memory%3A%20500Mi%0AfeatureGates%3A%0A%20%20RotateKubeletServerCertificate%3A%20true%0AserverTLSBootstrap%3A%20true%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/kubelet.conf
diff --git a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-manifests-etcd-member.yaml b/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-manifests-etcd-member.yaml
deleted file mode 100644
index 978589f9df..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-manifests-etcd-member.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,apiVersion%3A%20v1%0Akind%3A%20Pod%0Ametadata%3A%0A%20%20name%3A%20etcd-member%0A%20%20namespace%3A%20openshift-etcd%0A%20%20labels%3A%0A%20%20%20%20k8s-app%3A%20etcd%0Aspec%3A%0A%20%20initContainers%3A%0A%20%20-%20name%3A%20discovery%0A%20%20%20%20image%3A%20%22registry.svc.ci.openshift.org%2Fopenshift%2Forigin-v4.0%3Asetup-etcd-environment%22%0A%20%20%20%20args%3A%0A%20%20%20%20-%20%22run%22%0A%20%20%20%20-%20%22--discovery-srv%3Dmy-test-cluster.installer.team.coreos.systems%22%0A%20%20%20%20-%20%22--output-file%3D%2Frun%2Fetcd%2Fenvironment%22%0A%20%20%20%20-%20%22--v%3D4%22%0A%20%20%20%20securityContext%3A%0A%20%20%20%20%20%20priviledged%3A%20true%0A%20%20%20%20volumeMounts%3A%0A%20%20%20%20-%20name%3A%20discovery%0A%20%20%20%20%20%20mountPath%3A%20%2Frun%2Fetcd%2F%0A%20%20-%20name%3A%20certs%0A%20%20%20%20image%3A%20%22quay.io%2Fcoreos%2Fkube-client-agent%3A36c62ccd7b16b522450c61e96fc556b217ee24f5%22%20%23%23%20FIXME(abhinav)%3A%20these%20images%20should%20be%20replacable%20by%20release%20image.%0A%20%20%20%20command%3A%0A%20%20%20%20-%20%2Fbin%2Fsh%0A%20%20%20%20-%20-c%0A%20%20%20%20-%20%7C%0A%20%20%20%20%20%20%23!%2Fbin%2Fsh%0A%20%20%20%20%20%20set%20-euo%20pipefail%0A%0A%20%20%20%20%20%20source%20%2Frun%2Fetcd%2Fenvironment%0A%0A%20%20%20%20%20%20%5B%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.crt%20-a%20%5C%0A%20%20%20%20%20%20%20%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.key%20%5D%20%7C%7C%20%5C%0A%20%20%20%20%20%20%20%20%2Fusr%2Flocal%2Fbin%2Fkube-client-agent%20%5C%0A%20%20%20%20%20%20%20%20%20%20request%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--kubeconfig%3D%2Fetc%2Fkubernetes%2Fkubeconfig%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--orgname%3Dsystem%3Aetcd-servers%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--assetsdir%3D%2Fetc%2Fssl%2Fetcd%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--dnsnames%3Dlocalhost%2Cetcd.kube-system.svc%2Cetcd.kube-system.svc.cluster.local%2Cetcd.openshift-etcd.svc%2Cetcd.openshift-etcd.svc.cluster.local%2C%24%7BETCD_DNS_NAME%7D%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--commonname%3Dsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--ipaddrs%3D%24%7BETCD_IPV4_ADDRESS%7D%2C127.0.0.1%20%5C%0A%0A%20%20%20%20%20%20%5B%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.crt%20-a%20%5C%0A%20%20%20%20%20%20%20%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.key%20%5D%20%7C%7C%20%5C%0A%20%20%20%20%20%20%20%20%2Fusr%2Flocal%2Fbin%2Fkube-client-agent%20%5C%0A%20%20%20%20%20%20%20%20%20%20request%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--kubeconfig%3D%2Fetc%2Fkubernetes%2Fkubeconfig%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--orgname%3Dsystem%3Aetcd-peers%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--assetsdir%3D%2Fetc%2Fssl%2Fetcd%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--dnsnames%3D%24%7BETCD_DNS_NAME%7D%2Cmy-test-cluster.installer.team.coreos.systems%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--commonname%3Dsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--ipaddrs%3D%24%7BETCD_IPV4_ADDRESS%7D%20%5C%0A%20%20%20%20%20%20%0A%20%20%20%20securityContext%3A%0A%20%20%20%20%20%20priviledged%3A%20true%0A%20%20%20%20volumeMounts%3A%0A%20%20%20%20-%20name%3A%20discovery%0A%20%20%20%20%20%20mountPath%3A%20%2Frun%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20certs%0A%20%20%20%20%20%20mountPath%3A%20%2Fetc%2Fssl%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20kubeconfig%0A%20%20%20%20%20%20mountPath%3A%20%2Fetc%2Fkubernetes%2Fkubeconfig%0A%20%20containers%3A%0A%20%20-%20name%3A%20etcd-member%0A%20%20%20%20image%3A%20%22quay.io%2Fcoreos%2Fetcd%3Av3.3.10%22%20%23%23%20FIXME(abhinav)%3A%20these%20images%20should%20be%20replacable%20by%20release%20image.%0A%20%20%20%20command%3A%0A%20%20%20%20-%20%2Fbin%2Fsh%0A%20%20%20%20-%20-c%0A%20%20%20%20-%20%7C%0A%20%20%20%20%20%20%23!%2Fbin%2Fsh%0A%20%20%20%20%20%20set%20-euo%20pipefail%0A%0A%20%20%20%20%20%20source%20%2Frun%2Fetcd%2Fenvironment%0A%0A%20%20%20%20%20%20%2Fusr%2Flocal%2Fbin%2Fetcd%20%5C%0A%20%20%20%20%20%20%20%20--discovery-srv%20my-test-cluster.installer.team.coreos.systems%20%5C%0A%20%20%20%20%20%20%20%20--initial-advertise-peer-urls%3Dhttps%3A%2F%2F%24%7BETCD_IPV4_ADDRESS%7D%3A2380%20%5C%0A%20%20%20%20%20%20%20%20--cert-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.crt%20%5C%0A%20%20%20%20%20%20%20%20--key-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.key%20%5C%0A%20%20%20%20%20%20%20%20--trusted-ca-file%3D%2Fetc%2Fssl%2Fetcd%2Fca.crt%20%5C%0A%20%20%20%20%20%20%20%20--client-cert-auth%3Dtrue%20%5C%0A%20%20%20%20%20%20%20%20--peer-cert-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.crt%20%5C%0A%20%20%20%20%20%20%20%20--peer-key-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.key%20%5C%0A%20%20%20%20%20%20%20%20--peer-trusted-ca-file%3D%2Fetc%2Fssl%2Fetcd%2Fca.crt%20%5C%0A%20%20%20%20%20%20%20%20--peer-client-cert-auth%3Dtrue%20%5C%0A%20%20%20%20%20%20%20%20--advertise-client-urls%3Dhttps%3A%2F%2F%24%7BETCD_IPV4_ADDRESS%7D%3A2379%20%5C%0A%20%20%20%20%20%20%20%20--listen-client-urls%3Dhttps%3A%2F%2F0.0.0.0%3A2379%20%5C%0A%20%20%20%20%20%20%20%20--listen-peer-urls%3Dhttps%3A%2F%2F0.0.0.0%3A2380%20%5C%0A%20%20%20%20securityContext%3A%0A%20%20%20%20%20%20priviledged%3A%20true%0A%20%20%20%20volumeMounts%3A%0A%20%20%20%20-%20name%3A%20discovery%0A%20%20%20%20%20%20mountPath%3A%20%2Frun%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20certs%0A%20%20%20%20%20%20mountPath%3A%20%2Fetc%2Fssl%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20data-dir%0A%20%20%20%20%20%20mountPath%3A%20%2Fvar%2Flib%2Fetcd%2F%0A%20%20%20%20env%3A%0A%20%20%20%20-%20name%3A%20ETCD_DATA_DIR%0A%20%20%20%20%20%20value%3A%20%22%2Fvar%2Flib%2Fetcd%22%0A%20%20%20%20-%20name%3A%20ETCD_NAME%0A%20%20%20%20%20%20valueFrom%3A%0A%20%20%20%20%20%20%20%20fieldRef%3A%0A%20%20%20%20%20%20%20%20%20%20fieldPath%3A%20metadata.name%0A%20%20%20%20ports%3A%0A%20%20%20%20-%20name%3A%20peer%0A%20%20%20%20%20%20containerPort%3A%202380%0A%20%20%20%20%20%20protocol%3A%20TCP%0A%20%20%20%20-%20name%3A%20server%0A%20%20%20%20%20%20containerPort%3A%202379%0A%20%20%20%20%20%20protocol%3A%20TCP%0A%20%20hostNetwork%3A%20true%0A%20%20restartPolicy%3A%20Always%0A%20%20volumes%3A%0A%20%20-%20name%3A%20certs%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Fetc%2Fkubernetes%2Fstatic-pod-resources%2Fetcd-member%0A%20%20-%20name%3A%20kubeconfig%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Fetc%2Fkubernetes%2Fkubeconfig%0A%20%20-%20name%3A%20discovery%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Frun%2Fetcd%0A%20%20-%20name%3A%20data-dir%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Fvar%2Flib%2Fetcd%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/manifests/etcd-member.yaml
diff --git a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt b/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt
deleted file mode 100644
index 32bcd5d94d..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20etcd-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/static-pod-resources/etcd-member/ca.crt
diff --git a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt b/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt
deleted file mode 100644
index cb1bec649c..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20root-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/static-pod-resources/etcd-member/root-ca.crt
diff --git a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-sysctl.d-forward.conf
deleted file mode 100644
index dc3f2dc75d..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-sysctl.d-forward.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,net.ipv4.ip_forward%20%3D%201%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/sysctl.d/forward.conf
diff --git a/pkg/controller/template/test_data/templates/libvirt/master/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/libvirt/master/files/-var-lib-kubelet-config.json
deleted file mode 100644
index 0ba6c19e6a..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/master/files/-var-lib-kubelet-config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,%7B%22dummy%22%3A%22dummy%22%7D%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /var/lib/kubelet/config.json
diff --git a/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service b/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service
deleted file mode 100644
index 45abd5d904..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service
+++ /dev/null
@@ -1,35 +0,0 @@
-contents: |
-  [Unit]
-  Description=Kubernetes Kubelet
-  Wants=rpc-statd.service
-
-  [Service]
-  Type=notify
-  ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  EnvironmentFile=-/etc/kubernetes/kubelet-workaround
-  EnvironmentFile=-/etc/kubernetes/kubelet-env
-
-  ExecStart=/usr/bin/hyperkube \
-      kubelet \
-        --config=/etc/kubernetes/kubelet.conf \
-        --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
-        --rotate-certificates \
-        --kubeconfig=/var/lib/kubelet/kubeconfig \
-        --container-runtime=remote \
-        --container-runtime-endpoint=/var/run/crio/crio.sock \
-        --allow-privileged \
-        --node-labels=node-role.kubernetes.io/master \
-        --minimum-container-ttl-duration=6m0s \
-        --client-ca-file=/etc/kubernetes/ca.crt \
-        --cloud-provider= \
-        \
-        --anonymous-auth=false \
-        --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
-
-  Restart=always
-  RestartSec=10
-
-  [Install]
-  WantedBy=multi-user.target
-enabled: true
-name: kubelet.service
diff --git a/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-kubernetes-ca.crt
deleted file mode 100644
index 93e18c9420..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-kubernetes-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20root-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/ca.crt
diff --git a/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-kubernetes-kubelet.conf
deleted file mode 100644
index c2b5912b8f..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-kubernetes-kubelet.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,kind%3A%20KubeletConfiguration%0AapiVersion%3A%20kubelet.config.k8s.io%2Fv1beta1%0AcgroupDriver%3A%20systemd%0AclusterDNS%3A%0A%20%20-%2010.3.0.10%0AclusterDomain%3A%20cluster.local%0AmaxPods%3A%20250%0ArotateCertificates%3A%20true%0AruntimeRequestTimeout%3A%2010m%0AserializeImagePulls%3A%20false%0AstaticPodPath%3A%20%2Fetc%2Fkubernetes%2Fmanifests%0AsystemReserved%3A%0A%20%20cpu%3A%20500m%0A%20%20memory%3A%20500Mi%0AfeatureGates%3A%0A%20%20RotateKubeletServerCertificate%3A%20true%0AserverTLSBootstrap%3A%20true%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/kubelet.conf
diff --git a/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-sysctl.d-forward.conf
deleted file mode 100644
index dc3f2dc75d..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-sysctl.d-forward.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,net.ipv4.ip_forward%20%3D%201%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/sysctl.d/forward.conf
diff --git a/pkg/controller/template/test_data/templates/libvirt/worker/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/libvirt/worker/files/-var-lib-kubelet-config.json
deleted file mode 100644
index 0ba6c19e6a..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/worker/files/-var-lib-kubelet-config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,%7B%22dummy%22%3A%22dummy%22%7D%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /var/lib/kubelet/config.json
diff --git a/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service b/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service
deleted file mode 100644
index 9f5bd33f73..0000000000
--- a/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service
+++ /dev/null
@@ -1,33 +0,0 @@
-contents: |
-  [Unit]
-  Description=Kubernetes Kubelet
-  Wants=rpc-statd.service
-
-  [Service]
-  Type=notify
-  ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  EnvironmentFile=-/etc/kubernetes/kubelet-workaround
-  EnvironmentFile=-/etc/kubernetes/kubelet-env
-
-  ExecStart=/usr/bin/hyperkube \
-      kubelet \
-        --config=/etc/kubernetes/kubelet.conf \
-        --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
-        --kubeconfig=/var/lib/kubelet/kubeconfig \
-        --container-runtime=remote \
-        --container-runtime-endpoint=/var/run/crio/crio.sock \
-        --allow-privileged \
-        --node-labels=node-role.kubernetes.io/worker \
-        --minimum-container-ttl-duration=6m0s \
-        --client-ca-file=/etc/kubernetes/ca.crt \
-        --cloud-provider= \
-        \
-        --anonymous-auth=false \
-
-  Restart=always
-  RestartSec=10
-
-  [Install]
-  WantedBy=multi-user.target
-enabled: true
-name: kubelet.service
diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-systemd-system.conf.d-kubelet-cgroups.conf b/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-systemd-system.conf.d-kubelet-cgroups.conf
deleted file mode 100644
index 388167ff03..0000000000
--- a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-systemd-system.conf.d-kubelet-cgroups.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,%23%20Turning%20on%20Accounting%20helps%20track%20down%20performance%20issues.%0A%5BManager%5D%0ADefaultCPUAccounting%3Dyes%0ADefaultMemoryAccounting%3Dyes%0ADefaultBlockIOAccounting%3Dyes%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/systemd/system.conf.d/kubelet-cgroups.conf
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/files/-etc-kubernetes-cloud.conf b/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/files/-etc-kubernetes-cloud.conf
new file mode 100644
index 0000000000..4e8968ac5f
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/files/-etc-kubernetes-cloud.conf
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/kubernetes/cloud.conf
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service
index 2471578274..09f07c0e67 100644
--- a/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service
@@ -25,7 +25,7 @@ contents: |
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider=aws \
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
-        \
+         \
         --anonymous-auth=false \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
 
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/files/-etc-kubernetes-cloud.conf b/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/files/-etc-kubernetes-cloud.conf
new file mode 100644
index 0000000000..4e8968ac5f
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/files/-etc-kubernetes-cloud.conf
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/kubernetes/cloud.conf
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service
index 0cd5b0cefe..be7e293a06 100644
--- a/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service
@@ -25,7 +25,7 @@ contents: |
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider= \
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
-        \
+         \
         --anonymous-auth=false \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
 
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/files/-etc-kubernetes-cloud.conf b/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/files/-etc-kubernetes-cloud.conf
new file mode 100644
index 0000000000..4e8968ac5f
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/files/-etc-kubernetes-cloud.conf
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/kubernetes/cloud.conf
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service
index 0cd5b0cefe..be7e293a06 100644
--- a/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service
@@ -25,7 +25,7 @@ contents: |
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider= \
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
-        \
+         \
         --anonymous-auth=false \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
 
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/openstack/files/-etc-kubernetes-cloud.conf b/pkg/controller/template/test_data/templates/master/01-master-kubelet/openstack/files/-etc-kubernetes-cloud.conf
new file mode 100644
index 0000000000..62530a48d9
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/openstack/files/-etc-kubernetes-cloud.conf
@@ -0,0 +1,6 @@
+contents:
+  source: data:,testing%0Amulti-line%20cloud%20config%0A%5Btest%5D%0A%20%20option%20%3D%20dummy
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/kubernetes/cloud.conf
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/openstack/units/kubelet.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/openstack/units/kubelet.service
index 6d2c408d75..2e7852b648 100644
--- a/pkg/controller/template/test_data/templates/master/01-master-kubelet/openstack/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/openstack/units/kubelet.service
@@ -21,7 +21,7 @@ contents: |
         --node-labels=node-role.kubernetes.io/master \
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
-        \
+        --cloud-config=/etc/kubernetes/cloud.conf \
         --anonymous-auth=false \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
 
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/files/-etc-kubernetes-cloud.conf b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/files/-etc-kubernetes-cloud.conf
new file mode 100644
index 0000000000..62530a48d9
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/files/-etc-kubernetes-cloud.conf
@@ -0,0 +1,6 @@
+contents:
+  source: data:,testing%0Amulti-line%20cloud%20config%0A%5Btest%5D%0A%20%20option%20%3D%20dummy
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/kubernetes/cloud.conf
diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service
index f72424dcbd..08ff90f0f6 100644
--- a/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service
@@ -25,7 +25,7 @@ contents: |
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider=vsphere \
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
-        \
+        --cloud-config=/etc/kubernetes/cloud.conf \
         --anonymous-auth=false \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
 
diff --git a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-ca.crt
deleted file mode 100644
index 93e18c9420..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20root-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/ca.crt
diff --git a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-kubelet.conf
deleted file mode 100644
index 9cdc597762..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-kubelet.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,kind%3A%20KubeletConfiguration%0AapiVersion%3A%20kubelet.config.k8s.io%2Fv1beta1%0AcgroupDriver%3A%20systemd%0AclusterDNS%3A%0A%20%20-%2010.3.0.10%0AclusterDomain%3A%20cluster.local%0AmaxPods%3A%20250%0AruntimeRequestTimeout%3A%2010m%0AserializeImagePulls%3A%20false%0AstaticPodPath%3A%20%2Fetc%2Fkubernetes%2Fmanifests%0AsystemReserved%3A%0A%20%20cpu%3A%20500m%0A%20%20memory%3A%20500Mi%0AfeatureGates%3A%0A%20%20RotateKubeletServerCertificate%3A%20true%0AserverTLSBootstrap%3A%20true%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/kubelet.conf
diff --git a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-manifests-etcd-member.yaml b/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-manifests-etcd-member.yaml
deleted file mode 100644
index 978589f9df..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-manifests-etcd-member.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,apiVersion%3A%20v1%0Akind%3A%20Pod%0Ametadata%3A%0A%20%20name%3A%20etcd-member%0A%20%20namespace%3A%20openshift-etcd%0A%20%20labels%3A%0A%20%20%20%20k8s-app%3A%20etcd%0Aspec%3A%0A%20%20initContainers%3A%0A%20%20-%20name%3A%20discovery%0A%20%20%20%20image%3A%20%22registry.svc.ci.openshift.org%2Fopenshift%2Forigin-v4.0%3Asetup-etcd-environment%22%0A%20%20%20%20args%3A%0A%20%20%20%20-%20%22run%22%0A%20%20%20%20-%20%22--discovery-srv%3Dmy-test-cluster.installer.team.coreos.systems%22%0A%20%20%20%20-%20%22--output-file%3D%2Frun%2Fetcd%2Fenvironment%22%0A%20%20%20%20-%20%22--v%3D4%22%0A%20%20%20%20securityContext%3A%0A%20%20%20%20%20%20priviledged%3A%20true%0A%20%20%20%20volumeMounts%3A%0A%20%20%20%20-%20name%3A%20discovery%0A%20%20%20%20%20%20mountPath%3A%20%2Frun%2Fetcd%2F%0A%20%20-%20name%3A%20certs%0A%20%20%20%20image%3A%20%22quay.io%2Fcoreos%2Fkube-client-agent%3A36c62ccd7b16b522450c61e96fc556b217ee24f5%22%20%23%23%20FIXME(abhinav)%3A%20these%20images%20should%20be%20replacable%20by%20release%20image.%0A%20%20%20%20command%3A%0A%20%20%20%20-%20%2Fbin%2Fsh%0A%20%20%20%20-%20-c%0A%20%20%20%20-%20%7C%0A%20%20%20%20%20%20%23!%2Fbin%2Fsh%0A%20%20%20%20%20%20set%20-euo%20pipefail%0A%0A%20%20%20%20%20%20source%20%2Frun%2Fetcd%2Fenvironment%0A%0A%20%20%20%20%20%20%5B%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.crt%20-a%20%5C%0A%20%20%20%20%20%20%20%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.key%20%5D%20%7C%7C%20%5C%0A%20%20%20%20%20%20%20%20%2Fusr%2Flocal%2Fbin%2Fkube-client-agent%20%5C%0A%20%20%20%20%20%20%20%20%20%20request%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--kubeconfig%3D%2Fetc%2Fkubernetes%2Fkubeconfig%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--orgname%3Dsystem%3Aetcd-servers%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--assetsdir%3D%2Fetc%2Fssl%2Fetcd%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--dnsnames%3Dlocalhost%2Cetcd.kube-system.svc%2Cetcd.kube-system.svc.cluster.local%2Cetcd.openshift-etcd.svc%2Cetcd.openshift-etcd.svc.cluster.local%2C%24%7BETCD_DNS_NAME%7D%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--commonname%3Dsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--ipaddrs%3D%24%7BETCD_IPV4_ADDRESS%7D%2C127.0.0.1%20%5C%0A%0A%20%20%20%20%20%20%5B%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.crt%20-a%20%5C%0A%20%20%20%20%20%20%20%20-e%20%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.key%20%5D%20%7C%7C%20%5C%0A%20%20%20%20%20%20%20%20%2Fusr%2Flocal%2Fbin%2Fkube-client-agent%20%5C%0A%20%20%20%20%20%20%20%20%20%20request%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--kubeconfig%3D%2Fetc%2Fkubernetes%2Fkubeconfig%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--orgname%3Dsystem%3Aetcd-peers%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--assetsdir%3D%2Fetc%2Fssl%2Fetcd%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--dnsnames%3D%24%7BETCD_DNS_NAME%7D%2Cmy-test-cluster.installer.team.coreos.systems%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--commonname%3Dsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D%20%5C%0A%20%20%20%20%20%20%20%20%20%20%20%20--ipaddrs%3D%24%7BETCD_IPV4_ADDRESS%7D%20%5C%0A%20%20%20%20%20%20%0A%20%20%20%20securityContext%3A%0A%20%20%20%20%20%20priviledged%3A%20true%0A%20%20%20%20volumeMounts%3A%0A%20%20%20%20-%20name%3A%20discovery%0A%20%20%20%20%20%20mountPath%3A%20%2Frun%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20certs%0A%20%20%20%20%20%20mountPath%3A%20%2Fetc%2Fssl%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20kubeconfig%0A%20%20%20%20%20%20mountPath%3A%20%2Fetc%2Fkubernetes%2Fkubeconfig%0A%20%20containers%3A%0A%20%20-%20name%3A%20etcd-member%0A%20%20%20%20image%3A%20%22quay.io%2Fcoreos%2Fetcd%3Av3.3.10%22%20%23%23%20FIXME(abhinav)%3A%20these%20images%20should%20be%20replacable%20by%20release%20image.%0A%20%20%20%20command%3A%0A%20%20%20%20-%20%2Fbin%2Fsh%0A%20%20%20%20-%20-c%0A%20%20%20%20-%20%7C%0A%20%20%20%20%20%20%23!%2Fbin%2Fsh%0A%20%20%20%20%20%20set%20-euo%20pipefail%0A%0A%20%20%20%20%20%20source%20%2Frun%2Fetcd%2Fenvironment%0A%0A%20%20%20%20%20%20%2Fusr%2Flocal%2Fbin%2Fetcd%20%5C%0A%20%20%20%20%20%20%20%20--discovery-srv%20my-test-cluster.installer.team.coreos.systems%20%5C%0A%20%20%20%20%20%20%20%20--initial-advertise-peer-urls%3Dhttps%3A%2F%2F%24%7BETCD_IPV4_ADDRESS%7D%3A2380%20%5C%0A%20%20%20%20%20%20%20%20--cert-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.crt%20%5C%0A%20%20%20%20%20%20%20%20--key-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-server%3A%24%7BETCD_DNS_NAME%7D.key%20%5C%0A%20%20%20%20%20%20%20%20--trusted-ca-file%3D%2Fetc%2Fssl%2Fetcd%2Fca.crt%20%5C%0A%20%20%20%20%20%20%20%20--client-cert-auth%3Dtrue%20%5C%0A%20%20%20%20%20%20%20%20--peer-cert-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.crt%20%5C%0A%20%20%20%20%20%20%20%20--peer-key-file%3D%2Fetc%2Fssl%2Fetcd%2Fsystem%3Aetcd-peer%3A%24%7BETCD_DNS_NAME%7D.key%20%5C%0A%20%20%20%20%20%20%20%20--peer-trusted-ca-file%3D%2Fetc%2Fssl%2Fetcd%2Fca.crt%20%5C%0A%20%20%20%20%20%20%20%20--peer-client-cert-auth%3Dtrue%20%5C%0A%20%20%20%20%20%20%20%20--advertise-client-urls%3Dhttps%3A%2F%2F%24%7BETCD_IPV4_ADDRESS%7D%3A2379%20%5C%0A%20%20%20%20%20%20%20%20--listen-client-urls%3Dhttps%3A%2F%2F0.0.0.0%3A2379%20%5C%0A%20%20%20%20%20%20%20%20--listen-peer-urls%3Dhttps%3A%2F%2F0.0.0.0%3A2380%20%5C%0A%20%20%20%20securityContext%3A%0A%20%20%20%20%20%20priviledged%3A%20true%0A%20%20%20%20volumeMounts%3A%0A%20%20%20%20-%20name%3A%20discovery%0A%20%20%20%20%20%20mountPath%3A%20%2Frun%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20certs%0A%20%20%20%20%20%20mountPath%3A%20%2Fetc%2Fssl%2Fetcd%2F%0A%20%20%20%20-%20name%3A%20data-dir%0A%20%20%20%20%20%20mountPath%3A%20%2Fvar%2Flib%2Fetcd%2F%0A%20%20%20%20env%3A%0A%20%20%20%20-%20name%3A%20ETCD_DATA_DIR%0A%20%20%20%20%20%20value%3A%20%22%2Fvar%2Flib%2Fetcd%22%0A%20%20%20%20-%20name%3A%20ETCD_NAME%0A%20%20%20%20%20%20valueFrom%3A%0A%20%20%20%20%20%20%20%20fieldRef%3A%0A%20%20%20%20%20%20%20%20%20%20fieldPath%3A%20metadata.name%0A%20%20%20%20ports%3A%0A%20%20%20%20-%20name%3A%20peer%0A%20%20%20%20%20%20containerPort%3A%202380%0A%20%20%20%20%20%20protocol%3A%20TCP%0A%20%20%20%20-%20name%3A%20server%0A%20%20%20%20%20%20containerPort%3A%202379%0A%20%20%20%20%20%20protocol%3A%20TCP%0A%20%20hostNetwork%3A%20true%0A%20%20restartPolicy%3A%20Always%0A%20%20volumes%3A%0A%20%20-%20name%3A%20certs%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Fetc%2Fkubernetes%2Fstatic-pod-resources%2Fetcd-member%0A%20%20-%20name%3A%20kubeconfig%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Fetc%2Fkubernetes%2Fkubeconfig%0A%20%20-%20name%3A%20discovery%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Frun%2Fetcd%0A%20%20-%20name%3A%20data-dir%0A%20%20%20%20hostPath%3A%0A%20%20%20%20%20%20path%3A%20%2Fvar%2Flib%2Fetcd%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/manifests/etcd-member.yaml
diff --git a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt b/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt
deleted file mode 100644
index 32bcd5d94d..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20etcd-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/static-pod-resources/etcd-member/ca.crt
diff --git a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt b/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt
deleted file mode 100644
index cb1bec649c..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20root-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/static-pod-resources/etcd-member/root-ca.crt
diff --git a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/openstack/master/files/-etc-sysctl.d-forward.conf
deleted file mode 100644
index dc3f2dc75d..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/master/files/-etc-sysctl.d-forward.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,net.ipv4.ip_forward%20%3D%201%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/sysctl.d/forward.conf
diff --git a/pkg/controller/template/test_data/templates/openstack/master/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/openstack/master/files/-var-lib-kubelet-config.json
deleted file mode 100644
index 0ba6c19e6a..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/master/files/-var-lib-kubelet-config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,%7B%22dummy%22%3A%22dummy%22%7D%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /var/lib/kubelet/config.json
diff --git a/pkg/controller/template/test_data/templates/openstack/master/units/kubelet.service b/pkg/controller/template/test_data/templates/openstack/master/units/kubelet.service
deleted file mode 100644
index 6d2c408d75..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/master/units/kubelet.service
+++ /dev/null
@@ -1,34 +0,0 @@
-contents: |
-  [Unit]
-  Description=Kubernetes Kubelet
-  Wants=rpc-statd.service
-
-  [Service]
-  Type=notify
-  ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  EnvironmentFile=-/etc/kubernetes/kubelet-workaround
-  EnvironmentFile=-/etc/kubernetes/kubelet-env
-
-  ExecStart=/usr/bin/hyperkube \
-      kubelet \
-        --config=/etc/kubernetes/kubelet.conf \
-        --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
-        --rotate-certificates \
-        --kubeconfig=/var/lib/kubelet/kubeconfig \
-        --container-runtime=remote \
-        --container-runtime-endpoint=/var/run/crio/crio.sock \
-        --allow-privileged \
-        --node-labels=node-role.kubernetes.io/master \
-        --minimum-container-ttl-duration=6m0s \
-        --client-ca-file=/etc/kubernetes/ca.crt \
-        \
-        --anonymous-auth=false \
-        --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
-
-  Restart=always
-  RestartSec=10
-
-  [Install]
-  WantedBy=multi-user.target
-enabled: true
-name: kubelet.service
diff --git a/pkg/controller/template/test_data/templates/openstack/worker/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/openstack/worker/files/-etc-kubernetes-ca.crt
deleted file mode 100644
index 93e18c9420..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/worker/files/-etc-kubernetes-ca.crt
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,dummy%20root-ca%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/ca.crt
diff --git a/pkg/controller/template/test_data/templates/openstack/worker/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/openstack/worker/files/-etc-kubernetes-kubelet.conf
deleted file mode 100644
index c2b5912b8f..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/worker/files/-etc-kubernetes-kubelet.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,kind%3A%20KubeletConfiguration%0AapiVersion%3A%20kubelet.config.k8s.io%2Fv1beta1%0AcgroupDriver%3A%20systemd%0AclusterDNS%3A%0A%20%20-%2010.3.0.10%0AclusterDomain%3A%20cluster.local%0AmaxPods%3A%20250%0ArotateCertificates%3A%20true%0AruntimeRequestTimeout%3A%2010m%0AserializeImagePulls%3A%20false%0AstaticPodPath%3A%20%2Fetc%2Fkubernetes%2Fmanifests%0AsystemReserved%3A%0A%20%20cpu%3A%20500m%0A%20%20memory%3A%20500Mi%0AfeatureGates%3A%0A%20%20RotateKubeletServerCertificate%3A%20true%0AserverTLSBootstrap%3A%20true%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/kubernetes/kubelet.conf
diff --git a/pkg/controller/template/test_data/templates/openstack/worker/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/openstack/worker/files/-etc-sysctl.d-forward.conf
deleted file mode 100644
index dc3f2dc75d..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/worker/files/-etc-sysctl.d-forward.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,net.ipv4.ip_forward%20%3D%201%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/sysctl.d/forward.conf
diff --git a/pkg/controller/template/test_data/templates/openstack/worker/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/openstack/worker/files/-var-lib-kubelet-config.json
deleted file mode 100644
index 0ba6c19e6a..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/worker/files/-var-lib-kubelet-config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,%7B%22dummy%22%3A%22dummy%22%7D%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /var/lib/kubelet/config.json
diff --git a/pkg/controller/template/test_data/templates/openstack/worker/units/kubelet.service b/pkg/controller/template/test_data/templates/openstack/worker/units/kubelet.service
deleted file mode 100644
index 9170044283..0000000000
--- a/pkg/controller/template/test_data/templates/openstack/worker/units/kubelet.service
+++ /dev/null
@@ -1,32 +0,0 @@
-contents: |
-  [Unit]
-  Description=Kubernetes Kubelet
-  Wants=rpc-statd.service
-
-  [Service]
-  Type=notify
-  ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
-  EnvironmentFile=-/etc/kubernetes/kubelet-workaround
-  EnvironmentFile=-/etc/kubernetes/kubelet-env
-
-  ExecStart=/usr/bin/hyperkube \
-      kubelet \
-        --config=/etc/kubernetes/kubelet.conf \
-        --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
-        --kubeconfig=/var/lib/kubelet/kubeconfig \
-        --container-runtime=remote \
-        --container-runtime-endpoint=/var/run/crio/crio.sock \
-        --allow-privileged \
-        --node-labels=node-role.kubernetes.io/worker \
-        --minimum-container-ttl-duration=6m0s \
-        --client-ca-file=/etc/kubernetes/ca.crt \
-        \
-        --anonymous-auth=false \
-
-  Restart=always
-  RestartSec=10
-
-  [Install]
-  WantedBy=multi-user.target
-enabled: true
-name: kubelet.service
diff --git a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-systemd-system.conf.d-kubelet-cgroups.conf b/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-systemd-system.conf.d-kubelet-cgroups.conf
deleted file mode 100644
index 388167ff03..0000000000
--- a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-systemd-system.conf.d-kubelet-cgroups.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-contents:
-  source: data:,%23%20Turning%20on%20Accounting%20helps%20track%20down%20performance%20issues.%0A%5BManager%5D%0ADefaultCPUAccounting%3Dyes%0ADefaultMemoryAccounting%3Dyes%0ADefaultBlockIOAccounting%3Dyes%0A
-  verification: {}
-filesystem: root
-mode: 420
-path: /etc/systemd/system.conf.d/kubelet-cgroups.conf
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/files/-etc-kubernetes-cloud.conf b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/files/-etc-kubernetes-cloud.conf
new file mode 100644
index 0000000000..4e8968ac5f
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/files/-etc-kubernetes-cloud.conf
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/kubernetes/cloud.conf
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service
index 8179a7fe72..8bcce0ce8d 100644
--- a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service
@@ -24,7 +24,7 @@ contents: |
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider=aws \
-        \
+         \
         --anonymous-auth=false \
 
   Restart=always
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/files/-etc-kubernetes-cloud.conf b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/files/-etc-kubernetes-cloud.conf
new file mode 100644
index 0000000000..4e8968ac5f
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/files/-etc-kubernetes-cloud.conf
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/kubernetes/cloud.conf
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service
index 65c153df5b..f1bfb6e92b 100644
--- a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service
@@ -24,7 +24,7 @@ contents: |
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider= \
-        \
+         \
         --anonymous-auth=false \
 
   Restart=always
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/files/-etc-kubernetes-cloud.conf b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/files/-etc-kubernetes-cloud.conf
new file mode 100644
index 0000000000..4e8968ac5f
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/files/-etc-kubernetes-cloud.conf
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/kubernetes/cloud.conf
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service
index 65c153df5b..f1bfb6e92b 100644
--- a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service
@@ -24,7 +24,7 @@ contents: |
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider= \
-        \
+         \
         --anonymous-auth=false \
 
   Restart=always
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/openstack/files/-etc-kubernetes-cloud.conf b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/openstack/files/-etc-kubernetes-cloud.conf
new file mode 100644
index 0000000000..62530a48d9
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/openstack/files/-etc-kubernetes-cloud.conf
@@ -0,0 +1,6 @@
+contents:
+  source: data:,testing%0Amulti-line%20cloud%20config%0A%5Btest%5D%0A%20%20option%20%3D%20dummy
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/kubernetes/cloud.conf
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/openstack/units/kubelet.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/openstack/units/kubelet.service
index 9170044283..c7fe757f84 100644
--- a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/openstack/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/openstack/units/kubelet.service
@@ -20,7 +20,7 @@ contents: |
         --node-labels=node-role.kubernetes.io/worker \
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
-        \
+        --cloud-config=/etc/kubernetes/cloud.conf \
         --anonymous-auth=false \
 
   Restart=always
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/files/-etc-kubernetes-cloud.conf b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/files/-etc-kubernetes-cloud.conf
new file mode 100644
index 0000000000..62530a48d9
--- /dev/null
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/files/-etc-kubernetes-cloud.conf
@@ -0,0 +1,6 @@
+contents:
+  source: data:,testing%0Amulti-line%20cloud%20config%0A%5Btest%5D%0A%20%20option%20%3D%20dummy
+  verification: {}
+filesystem: root
+mode: 420
+path: /etc/kubernetes/cloud.conf
diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service
index 5990f7ea21..0a14df8ec2 100644
--- a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service
+++ b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service
@@ -24,7 +24,7 @@ contents: |
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider=vsphere \
-        \
+        --cloud-config=/etc/kubernetes/cloud.conf \
         --anonymous-auth=false \
 
   Restart=always
diff --git a/pkg/operator/bootstrap.go b/pkg/operator/bootstrap.go
index 3d183d8326..a4c084a849 100644
--- a/pkg/operator/bootstrap.go
+++ b/pkg/operator/bootstrap.go
@@ -12,6 +12,7 @@ import (
 
 	configv1 "github.com/openshift/api/config/v1"
 	configscheme "github.com/openshift/client-go/config/clientset/versioned/scheme"
+	corev1 "k8s.io/api/core/v1"
 
 	templatectrl "github.com/openshift/machine-config-operator/pkg/controller/template"
 )
@@ -20,6 +21,7 @@ import (
 func RenderBootstrap(
 	clusterConfigConfigMapFile string,
 	infraFile, networkFile string,
+	cloudConfigFile string,
 	etcdCAFile, etcdMetricCAFile string, rootCAFile string, kubeAPIServerServingCA string, pullSecretFile string,
 	imgs Images,
 	destinationDir string,
@@ -68,6 +70,23 @@ func RenderBootstrap(
 		return err
 	}
 
+	// if the cloudConfig is set in infra read the cloudConfigFile
+	if infra.Spec.CloudConfig.Name != "" {
+		data, err := ioutil.ReadFile(cloudConfigFile)
+		if err != nil {
+			return err
+		}
+		obji, err := runtime.Decode(configscheme.Codecs.UniversalDecoder(corev1.SchemeGroupVersion), data)
+		if err != nil {
+			return err
+		}
+		cm, ok := obji.(*corev1.ConfigMap)
+		if !ok {
+			return fmt.Errorf("expected *corev1.ConfigMap found %T", obji)
+		}
+		spec.CloudProviderConfig = cm.Data[infra.Spec.CloudConfig.Key]
+	}
+
 	bundle := make([]byte, 0)
 	bundle = append(bundle, filesData[rootCAFile]...)
 	// Append the kube-ca if given.
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
index 27528d7879..881a8ba590 100644
--- a/pkg/operator/operator.go
+++ b/pkg/operator/operator.go
@@ -367,6 +367,15 @@ func (optr *Operator) sync(key string) error {
 		return err
 	}
 
+	// if the cloudConfig is set in infra read the cloud config reference
+	if infra.Spec.CloudConfig.Name != "" {
+		cc, err := optr.getCloudConfigFromConfigMap("openshift-config", infra.Spec.CloudConfig.Name, infra.Spec.CloudConfig.Key)
+		if err != nil {
+			return err
+		}
+		spec.CloudProviderConfig = cc
+	}
+
 	spec.EtcdCAData = etcdCA
 	spec.EtcdMetricCAData = etcdMetricCA
 	spec.RootCAData = bundle
@@ -421,6 +430,18 @@ func (optr *Operator) getCAsFromConfigMap(namespace, name, key string) ([]byte,
 	}
 }
 
+func (optr *Operator) getCloudConfigFromConfigMap(namespace, name, key string) (string, error) {
+	cm, err := optr.clusterCmLister.ConfigMaps(namespace).Get(name)
+	if err != nil {
+		return "", err
+	}
+	if cc, ok := cm.Data[key]; ok {
+		return cc, nil
+	} else {
+		return "", fmt.Errorf("%s not found in %s/%s", key, namespace, name)
+	}
+}
+
 // getGlobalConfig gets global configuration for the cluster, namely, the Infrastructure and Network types.
 // Each type of global configuration is named `cluster` for easy discovery in the cluster.
 func (optr *Operator) getGlobalConfig() (*configv1.Infrastructure, *configv1.Network, error) {
diff --git a/templates/master/01-master-kubelet/_base/files/cloudconfig.yaml b/templates/master/01-master-kubelet/_base/files/cloudconfig.yaml
new file mode 100644
index 0000000000..c00694deaa
--- /dev/null
+++ b/templates/master/01-master-kubelet/_base/files/cloudconfig.yaml
@@ -0,0 +1,6 @@
+filesystem: "root"
+mode: 0644
+path: "/etc/kubernetes/cloud.conf"
+contents:
+  inline: |-
+{{indent 4 .CloudProviderConfig}}
diff --git a/templates/master/01-master-kubelet/_base/units/kubelet.yaml b/templates/master/01-master-kubelet/_base/units/kubelet.yaml
index 078e86daf8..c1d6733a8d 100644
--- a/templates/master/01-master-kubelet/_base/units/kubelet.yaml
+++ b/templates/master/01-master-kubelet/_base/units/kubelet.yaml
@@ -27,7 +27,7 @@ contents: |
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider={{cloudProvider .}} \
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
-        {{.CloudProviderConfig -}} \
+        {{cloudConfigFlag . }} \
         --anonymous-auth=false \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
 
diff --git a/templates/master/01-master-kubelet/openstack/units/kubelet.yaml b/templates/master/01-master-kubelet/openstack/units/kubelet.yaml
index 0dfde0b25f..1aa9a9e666 100644
--- a/templates/master/01-master-kubelet/openstack/units/kubelet.yaml
+++ b/templates/master/01-master-kubelet/openstack/units/kubelet.yaml
@@ -23,7 +23,7 @@ contents: |
         --node-labels=node-role.kubernetes.io/master \
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
-        {{.CloudProviderConfig -}} \
+        {{cloudConfigFlag . }} \
         --anonymous-auth=false \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
 
diff --git a/templates/worker/01-worker-kubelet/_base/files/cloudconfig.yaml b/templates/worker/01-worker-kubelet/_base/files/cloudconfig.yaml
new file mode 100644
index 0000000000..c00694deaa
--- /dev/null
+++ b/templates/worker/01-worker-kubelet/_base/files/cloudconfig.yaml
@@ -0,0 +1,6 @@
+filesystem: "root"
+mode: 0644
+path: "/etc/kubernetes/cloud.conf"
+contents:
+  inline: |-
+{{indent 4 .CloudProviderConfig}}
diff --git a/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml b/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml
index 15c71b30ed..49d8aecf42 100644
--- a/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml
+++ b/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml
@@ -26,7 +26,7 @@ contents: |
         --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider={{cloudProvider .}} \
-        {{.CloudProviderConfig -}} \
+        {{cloudConfigFlag . }} \
         --anonymous-auth=false \
 
   Restart=always
diff --git a/templates/worker/01-worker-kubelet/openstack/units/kubelet.yaml b/templates/worker/01-worker-kubelet/openstack/units/kubelet.yaml
index 28bae315ae..47f6eaccd9 100644
--- a/templates/worker/01-worker-kubelet/openstack/units/kubelet.yaml
+++ b/templates/worker/01-worker-kubelet/openstack/units/kubelet.yaml
@@ -22,7 +22,7 @@ contents: |
         --node-labels=node-role.kubernetes.io/worker \
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
-        {{.CloudProviderConfig -}} \
+        {{cloudConfigFlag . }} \
         --anonymous-auth=false \
 
   Restart=always