diff --git a/scripts/docker/build.sh b/scripts/docker/build.sh
index 76c093aef7..6adabd7317 100755
--- a/scripts/docker/build.sh
+++ b/scripts/docker/build.sh
@@ -202,6 +202,7 @@ build () {
            --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
            --build-arg ROS_VERSION=${ROS_VERSION} \
            --build-arg PYTHON=${PYTHON} \
+           --build-arg REVISION=${tag_revision} \
            $remote_args \
            -t astrobee/astrobee:${tag_revision}${tag_stage}ubuntu${UBUNTU_VERSION}
     { set +x; } 2>/dev/null
@@ -238,7 +239,7 @@ cd "${checkout_dir}"
 { set +x; } 2>/dev/null
 
 if [ "$build_astrobee_base" = "true" ]; then
-    build astrobee_base "${revision}-" "base-"
+    build astrobee_base "latest-" "base-"
 fi
 
 if [ "$build_astrobee" = "true" ]; then
@@ -246,7 +247,7 @@ if [ "$build_astrobee" = "true" ]; then
 fi
 
 if [ "$build_test_astrobee" = "true" ]; then
-    build test_astrobee "" "test-"
+    build test_astrobee "${revision}-" "test-"
 fi
 
 if [ "$astrobee_quick" = "true" ]; then
diff --git a/scripts/docker/test_astrobee.Dockerfile b/scripts/docker/test_astrobee.Dockerfile
index e361ff1529..6f1ae31a22 100644
--- a/scripts/docker/test_astrobee.Dockerfile
+++ b/scripts/docker/test_astrobee.Dockerfile
@@ -3,7 +3,8 @@
 
 ARG UBUNTU_VERSION=16.04
 ARG REMOTE=astrobee
-FROM ${REMOTE}/astrobee:latest-ubuntu${UBUNTU_VERSION}
+ARG REVISION=latest-
+FROM ${REMOTE}/astrobee:${REVISION}ubuntu${UBUNTU_VERSION}
 
 # Run tests. See also ../run_tests.sh for explanation.
 RUN cd /src/astrobee \