diff --git a/magnum/templates/kubernetes/fragments/enable-kube-apiserver-coreos.yaml b/magnum/templates/kubernetes/fragments/enable-kube-apiserver-coreos.yaml
index ecaccc8a23..b2b622e47a 100644
--- a/magnum/templates/kubernetes/fragments/enable-kube-apiserver-coreos.yaml
+++ b/magnum/templates/kubernetes/fragments/enable-kube-apiserver-coreos.yaml
@@ -46,7 +46,7 @@ write_files:
         hostNetwork: true
         containers:
         - name: kube-apiserver
-          image: gcr.io/google_containers/hyperkube:v1.0.6
+          image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
           command:
           - /hyperkube
           - apiserver
diff --git a/magnum/templates/kubernetes/fragments/enable-kube-controller-manager-coreos.yaml b/magnum/templates/kubernetes/fragments/enable-kube-controller-manager-coreos.yaml
index 1ddf449d2a..81af73fc81 100644
--- a/magnum/templates/kubernetes/fragments/enable-kube-controller-manager-coreos.yaml
+++ b/magnum/templates/kubernetes/fragments/enable-kube-controller-manager-coreos.yaml
@@ -39,7 +39,7 @@ write_files:
         hostNetwork: true
         containers:
         - name: kube-controller-manager
-          image: gcr.io/google_containers/hyperkube:v1.0.6
+          image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
           command:
           - /hyperkube
           - controller-manager
diff --git a/magnum/templates/kubernetes/fragments/enable-kube-podmaster.sh b/magnum/templates/kubernetes/fragments/enable-kube-podmaster.sh
index 90512d707a..93bdc65678 100644
--- a/magnum/templates/kubernetes/fragments/enable-kube-podmaster.sh
+++ b/magnum/templates/kubernetes/fragments/enable-kube-podmaster.sh
@@ -76,7 +76,7 @@ metadata:
 spec:
   containers:
   - name: kube-controller-manager
-    image: gcr.io/google_containers/hyperkube:v1.0.6
+    image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
     command:
     - /hyperkube
     - controller-manager
@@ -122,7 +122,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-scheduler
-    image: gcr.io/google_containers/hyperkube:v1.0.6
+    image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
     command:
     - /hyperkube
     - scheduler
diff --git a/magnum/templates/kubernetes/fragments/enable-kube-proxy-master-coreos.yaml b/magnum/templates/kubernetes/fragments/enable-kube-proxy-master-coreos.yaml
index 985214ccad..bc638ee767 100644
--- a/magnum/templates/kubernetes/fragments/enable-kube-proxy-master-coreos.yaml
+++ b/magnum/templates/kubernetes/fragments/enable-kube-proxy-master-coreos.yaml
@@ -39,7 +39,7 @@ write_files:
         hostNetwork: true
         containers:
         - name: kube-proxy
-          image: gcr.io/google_containers/hyperkube:v1.0.6
+          image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
           command:
           - /hyperkube
           - proxy
diff --git a/magnum/templates/kubernetes/fragments/enable-kube-proxy-master.sh b/magnum/templates/kubernetes/fragments/enable-kube-proxy-master.sh
index 096e34b64a..f369978c46 100644
--- a/magnum/templates/kubernetes/fragments/enable-kube-proxy-master.sh
+++ b/magnum/templates/kubernetes/fragments/enable-kube-proxy-master.sh
@@ -17,7 +17,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-proxy
-    image: gcr.io/google_containers/hyperkube:v1.0.6
+    image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
     command:
     - /hyperkube
     - proxy
diff --git a/magnum/templates/kubernetes/fragments/enable-kube-proxy-minion-coreos.yaml b/magnum/templates/kubernetes/fragments/enable-kube-proxy-minion-coreos.yaml
index 9a1e074c2e..3740e259da 100644
--- a/magnum/templates/kubernetes/fragments/enable-kube-proxy-minion-coreos.yaml
+++ b/magnum/templates/kubernetes/fragments/enable-kube-proxy-minion-coreos.yaml
@@ -42,7 +42,7 @@ write_files:
         hostNetwork: true
         containers:
         - name: kube-proxy
-          image: gcr.io/google_containers/hyperkube:v1.0.6
+          image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
           command:
           - /hyperkube
           - proxy
diff --git a/magnum/templates/kubernetes/fragments/enable-kube-proxy-minion.sh b/magnum/templates/kubernetes/fragments/enable-kube-proxy-minion.sh
index 9b9f4c1c80..fc4da78af3 100644
--- a/magnum/templates/kubernetes/fragments/enable-kube-proxy-minion.sh
+++ b/magnum/templates/kubernetes/fragments/enable-kube-proxy-minion.sh
@@ -25,7 +25,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-proxy
-    image: gcr.io/google_containers/hyperkube:v1.0.6
+    image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
     command:
     - /hyperkube
     - proxy
diff --git a/magnum/templates/kubernetes/fragments/enable-kube-scheduler-coreos.yaml b/magnum/templates/kubernetes/fragments/enable-kube-scheduler-coreos.yaml
index 43ef2c3f8e..9f956b6188 100644
--- a/magnum/templates/kubernetes/fragments/enable-kube-scheduler-coreos.yaml
+++ b/magnum/templates/kubernetes/fragments/enable-kube-scheduler-coreos.yaml
@@ -35,7 +35,7 @@ write_files:
         hostNetwork: true
         containers:
         - name: kube-scheduler
-          image: gcr.io/google_containers/hyperkube:v1.0.6
+          image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
           command:
           - /hyperkube
           - scheduler
diff --git a/magnum/templates/kubernetes/fragments/write-heat-params-master.yaml b/magnum/templates/kubernetes/fragments/write-heat-params-master.yaml
index 91d99c56c1..13a45cfaa8 100644
--- a/magnum/templates/kubernetes/fragments/write-heat-params-master.yaml
+++ b/magnum/templates/kubernetes/fragments/write-heat-params-master.yaml
@@ -30,3 +30,4 @@ write_files:
       HTTPS_PROXY="$HTTPS_PROXY"
       NO_PROXY="$NO_PROXY"
       WAIT_CURL="$WAIT_CURL"
+      KUBE_VERSION="$KUBE_VERSION"
diff --git a/magnum/templates/kubernetes/fragments/write-heat-params.yaml b/magnum/templates/kubernetes/fragments/write-heat-params.yaml
index 10d7ae3e18..d8f7d70f08 100644
--- a/magnum/templates/kubernetes/fragments/write-heat-params.yaml
+++ b/magnum/templates/kubernetes/fragments/write-heat-params.yaml
@@ -31,3 +31,4 @@ write_files:
       HTTPS_PROXY="$HTTPS_PROXY"
       NO_PROXY="$NO_PROXY"
       WAIT_CURL="$WAIT_CURL"
+      KUBE_VERSION="$KUBE_VERSION"
diff --git a/magnum/templates/kubernetes/kubecluster-coreos.yaml b/magnum/templates/kubernetes/kubecluster-coreos.yaml
index ce15419aa0..d79b630acc 100644
--- a/magnum/templates/kubernetes/kubecluster-coreos.yaml
+++ b/magnum/templates/kubernetes/kubecluster-coreos.yaml
@@ -146,6 +146,11 @@ parameters:
     type: string
     description: url for keystone
 
+  kube_version:
+    type: string
+    description: version of kubernetes used for kubernetes cluster
+    default: v1.0.6
+
 resources:
 
   ######################################################################
@@ -211,6 +216,7 @@ resources:
           network_driver: {get_param: network_driver}
           kubernetes_port: {get_param: kubernetes_port}
           tls_disabled: {get_param: tls_disabled}
+          kube_version: {get_param: kube_version}
 
   ######################################################################
   #
@@ -240,6 +246,7 @@ resources:
           network_driver: {get_param: network_driver}
           kubernetes_port: {get_param: kubernetes_port}
           tls_disabled: {get_param: tls_disabled}
+          kube_version: {get_param: kube_version}
           etcd_server_ip: {"Fn::Select": [0, {get_attr: [kube_master, kube_master_ip]}]}
 
 outputs:
diff --git a/magnum/templates/kubernetes/kubecluster.yaml b/magnum/templates/kubernetes/kubecluster.yaml
index adda7de773..45c9b15ea8 100644
--- a/magnum/templates/kubernetes/kubecluster.yaml
+++ b/magnum/templates/kubernetes/kubecluster.yaml
@@ -274,6 +274,11 @@ parameters:
     type: string
     description: url for keystone
 
+  kube_version:
+    type: string
+    description: version of kubernetes used for kubernetes cluster
+    default: v1.0.6
+
 resources:
 
   ######################################################################
@@ -452,6 +457,7 @@ resources:
           http_proxy: {get_param: http_proxy}
           https_proxy: {get_param: https_proxy}
           no_proxy: {get_param: no_proxy}
+          kube_version: {get_param: kube_version}
 
   ######################################################################
   #
@@ -502,6 +508,7 @@ resources:
           http_proxy: {get_param: http_proxy}
           https_proxy: {get_param: https_proxy}
           no_proxy: {get_param: no_proxy}
+          kube_version: {get_param: kube_version}
 
 outputs:
 
diff --git a/magnum/templates/kubernetes/kubemaster-coreos.yaml b/magnum/templates/kubernetes/kubemaster-coreos.yaml
index 506008560b..caa5a109dc 100644
--- a/magnum/templates/kubernetes/kubemaster-coreos.yaml
+++ b/magnum/templates/kubernetes/kubemaster-coreos.yaml
@@ -98,6 +98,10 @@ parameters:
       service.
     default: 8080
 
+  kube_version:
+    type: string
+    description: version of kubernetes used for kubernetes cluster
+
 resources:
 
   master_wait_handle:
@@ -170,6 +174,7 @@ resources:
             "$NETWORK_DRIVER": {get_param: network_driver}
             "$KUBE_API_PORT": {get_param: kubernetes_port}
             "$TLS_DISABLED": {get_param: tls_disabled}
+            "$KUBE_VERSION": {get_param: kube_version}
 
   configure_etcd:
     type: OS::Heat::SoftwareConfig
diff --git a/magnum/templates/kubernetes/kubemaster.yaml b/magnum/templates/kubernetes/kubemaster.yaml
index d669f7aaf5..0dde32399d 100644
--- a/magnum/templates/kubernetes/kubemaster.yaml
+++ b/magnum/templates/kubernetes/kubemaster.yaml
@@ -154,6 +154,9 @@ parameters:
     type: string
     description: no proxies for docker
     default: ""
+  kube_version:
+    type: string
+    description: version of kubernetes used for kubernetes cluster
 
 resources:
 
@@ -205,6 +208,7 @@ resources:
             "$HTTP_PROXY": {get_param: http_proxy}
             "$HTTPS_PROXY": {get_param: https_proxy}
             "$NO_PROXY": {get_param: no_proxy}
+            "$KUBE_VERSION": {get_param: kube_version}
             "$WAIT_CURL": {get_attr: [master_wait_handle, curl_cli]}
 
   make_cert:
diff --git a/magnum/templates/kubernetes/kubeminion-coreos.yaml b/magnum/templates/kubernetes/kubeminion-coreos.yaml
index 689b99f36b..b5e7d5ea9b 100644
--- a/magnum/templates/kubernetes/kubeminion-coreos.yaml
+++ b/magnum/templates/kubernetes/kubeminion-coreos.yaml
@@ -50,6 +50,10 @@ parameters:
       service.
     default: 8080
 
+  kube_version:
+    type: string
+    description: version of kubernetes used for kubernetes cluster
+
   # The following are all generated in the parent template.
   kube_master_ip:
     type: string
@@ -111,6 +115,7 @@ resources:
             $TLS_DISABLED: {get_param: tls_disabled}
             $NETWORK_DRIVER: {get_param: network_driver}
             $ETCD_SERVER_IP: {get_param: etcd_server_ip}
+            $KUBE_VERSION: {get_param: kube_version}
 
   enable_network_service:
     type: OS::Heat::SoftwareConfig
diff --git a/magnum/templates/kubernetes/kubeminion.yaml b/magnum/templates/kubernetes/kubeminion.yaml
index dba54ea705..3ff3a5d640 100644
--- a/magnum/templates/kubernetes/kubeminion.yaml
+++ b/magnum/templates/kubernetes/kubeminion.yaml
@@ -166,6 +166,10 @@ parameters:
     description: no proxies for docker
     default: ""
 
+  kube_version:
+    type: string
+    description: version of kubenetes used for kubernetes cluster
+
 resources:
 
   minion_wait_handle:
@@ -217,6 +221,7 @@ resources:
             $HTTP_PROXY: {get_param: http_proxy}
             $HTTPS_PROXY: {get_param: https_proxy}
             $NO_PROXY: {get_param: no_proxy}
+            $KUBE_VERSION: {get_param: kube_version}
             $WAIT_CURL: {get_attr: [minion_wait_handle, curl_cli]}
 
   write_kubeconfig: