diff --git a/tools/gate/kubeadm_aio.sh b/tools/gate/kubeadm_aio.sh
index ccd4379ecd..c8ad203dd2 100755
--- a/tools/gate/kubeadm_aio.sh
+++ b/tools/gate/kubeadm_aio.sh
@@ -16,5 +16,5 @@ set -ex
 source ${WORK_DIR}/tools/gate/funcs/kube.sh
 
 kubeadm_aio_reqs_install
-kubeadm_aio_build
+#kubeadm_aio_build
 kubeadm_aio_launch
diff --git a/tools/gate/setup_gate.sh b/tools/gate/setup_gate.sh
index 408a550f0e..2ae4227534 100755
--- a/tools/gate/setup_gate.sh
+++ b/tools/gate/setup_gate.sh
@@ -16,7 +16,7 @@ set -ex
 export HELM_VERSION=${2:-v2.3.0}
 export KUBE_VERSION=${3:-v1.6.0}
 export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf
-export KUBEADM_IMAGE=openstack-helm/kubeadm-aio:v1.6
+export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6
 
 export WORK_DIR=$(pwd)
 source ${WORK_DIR}/tools/gate/funcs/helm.sh
diff --git a/tools/kubeadm-aio/Dockerfile b/tools/kubeadm-aio/Dockerfile
index 7be3ea99b7..3ac2b87286 100644
--- a/tools/kubeadm-aio/Dockerfile
+++ b/tools/kubeadm-aio/Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:16.04
 MAINTAINER pete.birley@att.com
 
 ARG HELM_VERSION=v2.3.0
+ARG KUBE_VERSION=v1.6.2
 
 ENV container="docker" \
     DEBIAN_FRONTEND="noninteractive"
@@ -30,10 +31,14 @@ RUN set -x \
     && dpkg --configure kubeadm \
     && apt-get install -yf kubeadm \
     && mkdir -p /etc/kubernetes/manifests \
-# Install kubelet binary
-    && curl -sSL https://dl.k8s.io/v1.6.2/kubernetes-server-linux-amd64.tar.gz | tar -zxv --strip-components=1 \
+# Install kubelet & kubeadm binaries:
+# (portdirect) We do things in this weird way to let us use the deps and systemd
+# units from the packages in the .deb repo.
+    && curl -sSL https://dl.k8s.io/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz | tar -zxv --strip-components=1 \
     && mv /tmp/server/bin/kubelet /usr/bin/kubelet \
     && chmod +x /usr/bin/kubelet \
+    && mv /tmp/server/bin/kubeadm /usr/bin/kubeadm \
+    && chmod +x /usr/bin/kubeadm \
 # Move kubelet binary as we will run containerised
     && mv /usr/bin/kubelet /usr/bin/kubelet-real \
 # Install helm binary
diff --git a/tools/kubeadm-aio/README.md b/tools/kubeadm-aio/README.md
index 985dca853d..a22819cbed 100644
--- a/tools/kubeadm-aio/README.md
+++ b/tools/kubeadm-aio/README.md
@@ -41,20 +41,24 @@ And clone the OpenStack-Helm repo:
 git clone https://git.openstack.org/openstack/openstack-helm
 ```
 
-### Build and deploy the AIO environment
+### Build the AIO environment (Optional)
 
-From the root directory of the OpenStack-Helm repo run:
+A known good image is published to dockerhub on a fairly regular basis, but if
+you wish to build your own image, from the root directory of the OpenStack-Helm
+repo run:
 
 ``` bash
-export KUBEADM_IMAGE=openstack-helm/kubeadm-aio:v1.6
+export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6
 sudo docker build --pull -t ${KUBEADM_IMAGE} tools/kubeadm-aio
 ```
 
-To launch the environment then run:
+### Deploy the AIO environment
+
+To launch the environment run:
 
 ``` bash
-export KUBEADM_IMAGE=openstack-helm/kubeadm-aio:v1.6
-export KUBE_VERSION=v1.6.0
+export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.6
+export KUBE_VERSION=v1.6.2
 ./tools/kubeadm-aio/kubeadm-aio-launcher.sh
 export KUBECONFIG=${HOME}/.kubeadm-aio/admin.conf
 ```