diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index aa65f6684..014fb70f8 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -558,6 +558,7 @@ function run_k8s_kubelet {
     # saves us from the arduous task of setting up mounts to the official image
     # adding Python and all our CNI/binding dependencies.
     local command
+    local minor_version
 
     sudo mkdir -p "${KURYR_HYPERKUBE_DATA_DIR}/"{kubelet,kubelet.cert}
     command="$KURYR_HYPERKUBE_BINARY kubelet\
@@ -572,8 +573,9 @@ function run_k8s_kubelet {
         --cert-dir=${KURYR_HYPERKUBE_DATA_DIR}/kubelet.cert \
         --root-dir=${KURYR_HYPERKUBE_DATA_DIR}/kubelet"
 
-    # Kubernetes 1.8 requires additional option to work in the gate.
-    if [[ ${KURYR_HYPERKUBE_VERSION} == v1.8* ]]; then
+    # Kubernetes 1.8+ requires additional option to work in the gate.
+    minor_version=${KURYR_HYPERKUBE_VERSION:3:1}
+    if [ ${minor_version} -gt 7 ]; then
         command="$command --fail-swap-on=false"
     fi
 
diff --git a/devstack/settings b/devstack/settings
index 40b835e18..d8e1361c2 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -34,7 +34,7 @@ KURYR_ETCD_LISTEN_PEER_URL=${KURYR_ETCD_LISTEN_PEER_URL:-http://0.0.0.0:2380}
 
 # HYPERKUBE
 KURYR_HYPERKUBE_IMAGE=${KURYR_HYPERKUBE_IMAGE:-gcr.io/google_containers/hyperkube-amd64}
-KURYR_HYPERKUBE_VERSION=${KURYR_HYPERKUBE_VERSION:-v1.8.5}
+KURYR_HYPERKUBE_VERSION=${KURYR_HYPERKUBE_VERSION:-v1.9.0}
 KURYR_HYPERKUBE_DATA_DIR=${KURYR_HYPERKUBE_DATA_DIR:-${DATA_DIR}/hyperkube}
 KURYR_HYPERKUBE_BINARY=${KURYR_HYPERKUBE_BINARY:-/usr/local/bin/hyperkube}