diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver
index 3abf2e1c..83c318ec 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver
@@ -1,7 +1,7 @@
 #Kube-Apiserver Upstart and SysVinit configuration file
 
 # Customize kube-apiserver binary location
-# KUBE_APISERVER="/opt/bin/kube-apiserver"
+KUBE_APISERVER="/opt/bin/hyperkube apiserver"
 
 # Use KUBE_APISERVER_OPTS to modify the start/restart options
 KUBE_APISERVER_OPTS="--address=0.0.0.0 \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager
index 3ccf9067..4e335fe1 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager
@@ -1,7 +1,7 @@
  # Kube-Controller-Manager Upstart and SysVinit configuration file
 
  # Customize kube-controller-manager binary location
- # KUBE_CONTROLLER_MANAGER="/opt/bin/kube-controller-manager"
+ KUBE_CONTROLLER_MANAGER="/opt/bin/hyperkube controller-manager"
 
  # Use KUBE_CONTROLLER_MANAGER_OPTS to modify the start/restart options
  KUBE_CONTROLLER_MANAGER_OPTS="--master=127.0.0.1:8080 \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy
index 1917e970..11da8ab4 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy
@@ -1,7 +1,7 @@
 # Kube-Proxy Upstart and SysVinit configuration file
 
 # Customize kube-proxy binary location
-# KUBE_PROXY="/opt/bin/kube-proxy"
+KUBE_PROXY="/opt/bin/hyperkube proxy"
 
 # Use KUBE_PROXY_OPTS to modify the start/restart options
 KUBE_PROXY_OPTS="--logtostderr=false --master=http://%%MASTER_IP%%:8080 --log_dir=/var/log/kubernetes"
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler
index 4cde0dcb..00f52274 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler
@@ -1,7 +1,7 @@
 # Kube-Scheduler Upstart and SysVinit configuration file
 
 # Customize kube-apiserver binary location
-# KUBE_SCHEDULER="/opt/bin/kube-apiserver"
+KUBE_SCHEDULER="/opt/bin/hyperkube scheduler"
 
 # Use KUBE_SCHEDULER_OPTS to modify the start/restart options
 KUBE_SCHEDULER_OPTS="--logtostderr=false --log_dir=/var/log/kubernetes \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet
index 92e1e130..a51bd2bb 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet
@@ -1,7 +1,7 @@
 # Kubelet Upstart and SysVinit configuration file
 
 # Customize kubelet binary location
-# KUBELET="/opt/bin/kubelet"
+KUBELET="/opt/bin/hyperkube kubelet"
 
 # Use KUBELET_OPTS to modify the start/restart options
 KUBELET_OPTS="--address=%%IP%% \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf
index bf03e23d..cb6484a4 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf
@@ -9,7 +9,7 @@ stop on stopping etcd
 
 pre-start script
     # see also https://github.com/jainvipin/kubernetes-start
-    KUBE_APISERVER=/opt/bin/$UPSTART_JOB
+    KUBE_APISERVER=/opt/bin/hyperkube apiserver
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf
index 0ae9464b..edeb7b96 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf
@@ -9,7 +9,7 @@ stop on stopping etcd
 
 pre-start script
     # see also https://github.com/jainvipin/kubernetes-ubuntu-start
-    KUBE_CONTROLLER_MANAGER=/opt/bin/$UPSTART_JOB
+    KUBE_CONTROLLER_MANAGER=/opt/bin/hyperkube controller-manager
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf
index fcc77627..dc1f8dff 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf
@@ -9,7 +9,7 @@ stop on stopping etcd
 
 pre-start script
     # see also https://github.com/jainvipin/kubernetes-start
-    KUBE_PROXY=/opt/bin/$UPSTART_JOB
+    KUBE_PROXY=/opt/bin/hyperkube proxy
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf
index 32e0bba5..0f1d0925 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf
@@ -9,7 +9,7 @@ stop on stopping etcd
 
 pre-start script
     # see also https://github.com/jainvipin/kubernetes-start
-    KUBE_SCHEDULER=/opt/bin/$UPSTART_JOB
+    KUBE_SCHEDULER=/opt/bin/hyperkube scheduler
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf
index a13807cf..362673b3 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf
@@ -9,7 +9,7 @@ stop on stopping etcd
 
 pre-start script
     # see also https://github.com/jainvipin/kubernetes-ubuntu-start
-    KUBELET=/opt/bin/$UPSTART_JOB
+    KUBELET=/opt/bin/hyperkube kubelet
     if [ -f /etc/default/$UPSTART_JOB ]; then
         . /etc/default/$UPSTART_JOB
     fi
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver
index 77709f63..895e39c0 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver
@@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
 BASE=$(basename $0)
 
 # modify these in /etc/default/$BASE (/etc/default/kube-apiserver)
-KUBE_APISERVER=/opt/bin/$BASE
+KUBE_APISERVER=/opt/bin/hyperkube apiserver
 # This is the pid file managed by kube-apiserver itself
 KUBE_APISERVER_PIDFILE=/var/run/$BASE.pid
 KUBE_APISERVER_LOGFILE=/var/log/$BASE.log
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager
index 1eb467db..78f726aa 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager
@@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
 BASE=$(basename $0)
 
 # modify these in /etc/default/$BASE (/etc/default/kube-controller-manager)
-KUBE_CONTROLLER_MANAGER=/opt/bin/$BASE
+KUBE_CONTROLLER_MANAGER=/opt/bin/hyperkube controller-manager
 # This is the pid file managed by kube-controller-manager itself
 KUBE_CONTROLLER_MANAGER_PIDFILE=/var/run/$BASE.pid
 KUBE_CONTROLLER_MANAGER_LOGFILE=/var/log/$BASE.log
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy
index 8dbb6205..c4fae679 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy
@@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
 BASE=$(basename $0)
 
 # modify these in /etc/default/$BASE (/etc/default/kube-proxy)
-KUBE_PROXY=/opt/bin/$BASE
+KUBE_PROXY=/opt/bin/hyperkube proxy
 # This is the pid file managed by kube-proxy itself
 KUBE_PROXY_PIDFILE=/var/run/$BASE.pid
 KUBE_PROXY_LOGFILE=/var/log/$BASE.log
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler
index 7e9ba6f8..fe79d6df 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler
@@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
 BASE=$(basename $0)
 
 # modify these in /etc/default/$BASE (/etc/default/kube-scheduler)
-KUBE_SCHEDULER=/opt/bin/$BASE
+KUBE_SCHEDULER=/opt/bin/hyperkube scheduler
 # This is the pid file managed by kube-scheduler itself
 KUBE_SCHEDULER_PIDFILE=/var/run/$BASE.pid
 KUBE_SCHEDULER_LOGFILE=/var/log/$BASE.log
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet
index 47e016cc..b6382e9f 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet
@@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
 BASE=$(basename $0)
 
 # modify these in /etc/default/$BASE (/etc/default/kube-apiserver)
-KUBELET=/opt/bin/$BASE
+KUBELET=/opt/bin/hyperkube kubelet
 # This is the pid file managed by kube-apiserver itself
 KUBELET_PIDFILE=/var/run/$BASE.pid
 KUBELET_LOGFILE=/var/log/$BASE.log
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-apiserver.service b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-apiserver.service
index 2ea0019c..33b85e74 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-apiserver.service
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-apiserver.service
@@ -7,7 +7,7 @@ After=etcd.service
 [Service]
 EnvironmentFile=-/etc/kubernetes/config
 EnvironmentFile=-/etc/kubernetes/apiserver
-ExecStart=/opt/bin/kube-apiserver \
+ExecStart=/opt/bin/hyperkube apiserver \
             $KUBE_LOGTOSTDERR \
             $KUBE_LOG_LEVEL \
             $KUBE_ETCD_SERVERS \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-controller-manager.service b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-controller-manager.service
index f958c12f..9959e59d 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-controller-manager.service
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-controller-manager.service
@@ -4,7 +4,7 @@ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
 
 [Service]
 EnvironmentFile=-/etc/kubernetes/config
-ExecStart=/opt/bin/kube-controller-manager \
+ExecStart=/opt/bin/hyperkube controller-manager \
             $KUBE_LOGTOSTDERR \
             $KUBE_LOG_LEVEL \
             $KUBE_MASTER \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-proxy.service b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-proxy.service
index 8da29f53..0951bfd2 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-proxy.service
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-proxy.service
@@ -6,7 +6,7 @@ After=network.target
 [Service]
 EnvironmentFile=-/etc/kubernetes/config
 EnvironmentFile=-/etc/kubernetes/proxy
-ExecStart=/opt/bin/kube-proxy \
+ExecStart=/opt/bin/hyperkube proxy \
 	    $KUBE_LOGTOSTDERR \
 	    $KUBE_LOG_LEVEL \
 	    $KUBE_MASTER \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-scheduler.service b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-scheduler.service
index c8f27381..5dd02a86 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-scheduler.service
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-scheduler.service
@@ -4,7 +4,7 @@ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
 
 [Service]
 EnvironmentFile=-/etc/kubernetes/config
-ExecStart=/opt/bin/kube-scheduler \
+ExecStart=/opt/bin/hyperkube scheduler \
             $KUBE_LOGTOSTDERR \
             $KUBE_LOG_LEVEL \
             $KUBE_MASTER \
diff --git a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kubelet.service b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kubelet.service
index 0d092495..5b1e291e 100644
--- a/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kubelet.service
+++ b/Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kubelet.service
@@ -7,7 +7,7 @@ Requires=docker.service
 [Service]
 EnvironmentFile=-/etc/kubernetes/config
 EnvironmentFile=-/etc/kubernetes/kubelet
-ExecStart=/opt/bin/kubelet \
+ExecStart=/opt/bin/hyperkube kubelet \
             $KUBE_LOGTOSTDERR \
             $KUBE_LOG_LEVEL \
             $KUBELET_API_SERVER \