diff --git a/cmd/dotmesh-server/rebuild.sh b/cmd/dotmesh-server/rebuild.sh
index 0a4bc40db..be5fb95a6 100755
--- a/cmd/dotmesh-server/rebuild.sh
+++ b/cmd/dotmesh-server/rebuild.sh
@@ -6,14 +6,15 @@
 # without k8s - export DISABLE_K8S=1 disables the k8s build
 set -xe
 
+VERSION="$(cd ../versioner && go run versioner.go)"
+
 CI_DOCKER_SERVER_IMAGE=${CI_DOCKER_SERVER_IMAGE:=$(hostname).local:80/dotmesh/dotmesh-server:latest}
 CI_DOCKER_PROVISIONER_IMAGE=${CI_DOCKER_PROVISIONER_IMAGE:=$(hostname).local:80/dotmesh/dotmesh-dynamic-provisioner:latest}
-VERSION="$(cd ../versioner && go run versioner.go)"
 
 if [ x$CI_DOCKER_TAG == x ]
 then
          # Non-CI build
-         CI_DOCKER_TAG=latest
+         CI_DOCKER_TAG=$VERSION
 fi
 
 mkdir -p target