diff --git a/cluster/plan.go b/cluster/plan.go
index c8435bfc..81195b84 100644
--- a/cluster/plan.go
+++ b/cluster/plan.go
@@ -381,6 +381,8 @@ func (c *Cluster) BuildKubeControllerProcess(host *hosts.Host, serviceOptions v3
 
 	if matchedRange {
 		Binds = util.RemoveZFromBinds(Binds)
+		CommandArgs["authentication-kubeconfig"] = CommandArgs["kubeconfig"]
+		CommandArgs["authorization-kubeconfig"] = CommandArgs["kubeconfig"]
 	}
 
 	for arg, value := range c.Services.KubeController.ExtraArgs {
@@ -818,6 +820,8 @@ func (c *Cluster) BuildSchedulerProcess(host *hosts.Host, serviceOptions v3.Kube
 
 	if matchedRange {
 		Binds = util.RemoveZFromBinds(Binds)
+		CommandArgs["authentication-kubeconfig"] = CommandArgs["kubeconfig"]
+		CommandArgs["authorization-kubeconfig"] = CommandArgs["kubeconfig"]
 	}
 
 	Binds = append(Binds, c.Services.Scheduler.ExtraBinds...)