diff --git a/util/cron/test-docker.bash b/util/cron/test-docker.bash
index f1e02b2e83a0..c3aaffa1a914 100755
--- a/util/cron/test-docker.bash
+++ b/util/cron/test-docker.bash
@@ -18,7 +18,7 @@ local imageName="$1"
 local script="$2" 
 # Remove any existing image with the tag before building docker image
 docker image rm --force $imageName
-docker build . -t $imageName
+docker build --load . -t $imageName
 containerid= docker image ls | grep $imageName | awk '{print$3}'
 cd ${CHPL_HOME}/util/cron
 echo 'writeln("Hello, world!");' > hello.chpl
@@ -38,12 +38,12 @@ fi
 
 # Build chapel docker image. 
 cd $CHPL_HOME
-build_image chapel  ${CHPL_HOME}/util/cron/docker-chapel.bash
+build_image chapel/chapel  ${CHPL_HOME}/util/cron/docker-chapel.bash
 
 cd $CHPL_HOME/util/packaging/docker/gasnet
-build_image chapel_gasnet ${CHPL_HOME}/util/cron/docker-gasnet.bash
+build_image chapel/chapel_gasnet ${CHPL_HOME}/util/cron/docker-gasnet.bash
 
 cd $CHPL_HOME/util/packaging/docker/gasnet-smp
-build_image chapel_gasnet_smp ${CHPL_HOME}/util/cron/docker-gasnet.bash
+build_image chapel/chapel_gasnet_smp ${CHPL_HOME}/util/cron/docker-gasnet.bash
 
 export CHPL_NIGHTLY_TEST_CONFIG_NAME="docker"