diff --git a/tools/gate/vars.sh b/tools/gate/vars.sh
index d32a482b8e..e7d3fdb587 100755
--- a/tools/gate/vars.sh
+++ b/tools/gate/vars.sh
@@ -24,7 +24,7 @@ export HOST_OS=${HOST_OS:="${ID}"}
 
 # Set versions of K8s and Helm to use
 export HELM_VERSION=${HELM_VERSION:-"v2.6.1"}
-export KUBE_VERSION=${KUBE_VERSION:-"v1.7.5"}
+export KUBE_VERSION=${KUBE_VERSION:-"v1.8.2"}
 
 # Set K8s-AIO options
 export KUBECONFIG=${KUBECONFIG:="${HOME}/.kubeadm-aio/admin.conf"}
diff --git a/tools/kubeadm-aio/assets/usr/bin/openstack-helm-dev-prep b/tools/kubeadm-aio/assets/usr/bin/openstack-helm-dev-prep
index f81d2fc39e..fe7e9dd980 100755
--- a/tools/kubeadm-aio/assets/usr/bin/openstack-helm-dev-prep
+++ b/tools/kubeadm-aio/assets/usr/bin/openstack-helm-dev-prep
@@ -24,4 +24,4 @@ kubectl label nodes openvswitch=enabled --all --namespace=openstack --overwrite
 kubectl label nodes openstack-compute-node=enabled --all --namespace=openstack --overwrite
 
 echo 'RBAC: applying development rules (totally open!)'
-kubectl update -f /opt/rbac/dev.yaml
+kubectl replace -f /opt/rbac/dev.yaml