diff --git a/cluster.yml b/cluster.yml
index dce4ab763..b1939b5b4 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -31,23 +31,23 @@ services:
   etcd:
     image: quay.io/coreos/etcd:latest
   kube-api:
-    image: quay.io/coreos/hyperkube:v1.7.5_coreos.0
+    image: rancher/k8s:v1.8.3-rancher2
     service_cluster_ip_range: 10.233.0.0/18
     extra_args:
       v: 4
   kube-controller:
-    image: quay.io/coreos/hyperkube:v1.7.5_coreos.0
+    image: rancher/k8s:v1.8.3-rancher2
     cluster_cidr: 10.233.64.0/18
     service_cluster_ip_range: 10.233.0.0/18
   scheduler:
-    image: quay.io/coreos/hyperkube:v1.7.5_coreos.0
+    image: rancher/k8s:v1.8.3-rancher2
   kubelet:
-    image: quay.io/coreos/hyperkube:v1.7.5_coreos.0
+    image: rancher/k8s:v1.8.3-rancher2
     cluster_domain: cluster.local
     cluster_dns_server: 10.233.0.3
     infra_container_image: gcr.io/google_containers/pause-amd64:3.0
   kubeproxy:
-    image: quay.io/coreos/hyperkube:v1.7.5_coreos.0
+    image: rancher/k8s:v1.8.3-rancher2
 
 # all addon manifests MUST specify a namespace
 addons: |-
diff --git a/services/kubeapi.go b/services/kubeapi.go
index ff5b3e193..75c241a71 100644
--- a/services/kubeapi.go
+++ b/services/kubeapi.go
@@ -50,8 +50,7 @@ func removeKubeAPI(host hosts.Host) error {
 func buildKubeAPIConfig(host hosts.Host, kubeAPIService v1.KubeAPIService, etcdConnString string) (*container.Config, *container.HostConfig) {
 	imageCfg := &container.Config{
 		Image: kubeAPIService.Image,
-		Cmd: []string{"/hyperkube",
-			"apiserver",
+		Entrypoint: []string{"kube-apiserver",
 			"--insecure-bind-address=127.0.0.1",
 			"--insecure-port=8080",
 			"--secure-port=6443",
diff --git a/services/kubecontroller.go b/services/kubecontroller.go
index 53185123b..6e7eab9d9 100644
--- a/services/kubecontroller.go
+++ b/services/kubecontroller.go
@@ -49,8 +49,7 @@ func removeKubeController(host hosts.Host) error {
 func buildKubeControllerConfig(kubeControllerService v1.KubeControllerService) (*container.Config, *container.HostConfig) {
 	imageCfg := &container.Config{
 		Image: kubeControllerService.Image,
-		Cmd: []string{"/hyperkube",
-			"controller-manager",
+		Entrypoint: []string{"kube-controller-manager",
 			"--address=0.0.0.0",
 			"--cloud-provider=",
 			"--leader-elect=true",
diff --git a/services/kubelet.go b/services/kubelet.go
index be4e64b7c..76997a59f 100644
--- a/services/kubelet.go
+++ b/services/kubelet.go
@@ -49,8 +49,7 @@ func removeKubelet(host hosts.Host) error {
 func buildKubeletConfig(host hosts.Host, kubeletService v1.KubeletService, isMaster bool) (*container.Config, *container.HostConfig) {
 	imageCfg := &container.Config{
 		Image: kubeletService.Image,
-		Cmd: []string{"/hyperkube",
-			"kubelet",
+		Entrypoint: []string{"kubelet",
 			"--v=2",
 			"--address=0.0.0.0",
 			"--cluster-domain=" + kubeletService.ClusterDomain,
diff --git a/services/kubeproxy.go b/services/kubeproxy.go
index 8cb30f4af..a997a72cb 100644
--- a/services/kubeproxy.go
+++ b/services/kubeproxy.go
@@ -48,8 +48,7 @@ func removeKubeproxy(host hosts.Host) error {
 func buildKubeproxyConfig(host hosts.Host, kubeproxyService v1.KubeproxyService) (*container.Config, *container.HostConfig) {
 	imageCfg := &container.Config{
 		Image: kubeproxyService.Image,
-		Cmd: []string{"/hyperkube",
-			"proxy",
+		Entrypoint: []string{"kube-proxy",
 			"--v=2",
 			"--healthz-bind-address=0.0.0.0",
 			"--kubeconfig=" + pki.KubeProxyConfigPath,
diff --git a/services/scheduler.go b/services/scheduler.go
index 33a487100..6a5c3cb8c 100644
--- a/services/scheduler.go
+++ b/services/scheduler.go
@@ -48,8 +48,7 @@ func removeScheduler(host hosts.Host) error {
 func buildSchedulerConfig(host hosts.Host, schedulerService v1.SchedulerService) (*container.Config, *container.HostConfig) {
 	imageCfg := &container.Config{
 		Image: schedulerService.Image,
-		Cmd: []string{"/hyperkube",
-			"scheduler",
+		Entrypoint: []string{"kube-scheduler",
 			"--leader-elect=true",
 			"--v=2",
 			"--address=0.0.0.0",