diff --git a/cloud/vsphere/templates.go b/cloud/vsphere/templates.go
index 456a00c0d6c1..36ba724a0566 100644
--- a/cloud/vsphere/templates.go
+++ b/cloud/vsphere/templates.go
@@ -319,6 +319,9 @@ kind: MasterConfiguration
 api:
   advertiseAddress: ${PUBLICIP}
   bindPort: ${PORT}
+etcd:
+  extraArgs:
+    listen-client-urls: http://0.0.0.0:2379
 networking:
   serviceSubnet: ${SERVICE_CIDR}
   podSubnet: ${POD_CIDR}
diff --git a/clusterctl/examples/google/provider-components.yaml.template b/clusterctl/examples/google/provider-components.yaml.template
index 4eb8df9acb85..680e2d51d627 100644
--- a/clusterctl/examples/google/provider-components.yaml.template
+++ b/clusterctl/examples/google/provider-components.yaml.template
@@ -252,6 +252,9 @@ data:
           api:
             advertiseAddress: ${PUBLICIP}
             bindPort: ${PORT}
+          etcd:
+            extraArgs:
+              listen-client-urls: http://0.0.0.0:2379
           networking:
             serviceSubnet: ${SERVICE_CIDR}
           kubernetesVersion: v${CONTROL_PLANE_VERSION}
@@ -261,6 +264,9 @@ data:
             cluster-cidr: ${POD_CIDR}
             service-cluster-ip-range: ${SERVICE_CIDR}
             allocate-node-cidrs: "true"
+            address: 0.0.0.0
+          schedulerExtraArgs:
+            address: 0.0.0.0
           apiServerCertSANs:
           - ${PUBLICIP}
           - ${PRIVATEIP}
diff --git a/gcp-deployer/machine_setup_configs.yaml b/gcp-deployer/machine_setup_configs.yaml
index 27a707d815df..1a5ac089129a 100644
--- a/gcp-deployer/machine_setup_configs.yaml
+++ b/gcp-deployer/machine_setup_configs.yaml
@@ -96,6 +96,9 @@ items:
       api:
         advertiseAddress: ${PUBLICIP}
         bindPort: ${PORT}
+      etcd:
+        extraArgs:
+          listen-client-urls: http://0.0.0.0:2379
       networking:
         serviceSubnet: ${SERVICE_CIDR}
       kubernetesVersion: v${CONTROL_PLANE_VERSION}