diff --git a/docker-compose.yml b/base-services.yml
similarity index 100%
rename from docker-compose.yml
rename to base-services.yml
diff --git a/images/build_images.sh b/images/build_images.sh
index 9f24f5d..9e410a1 100755
--- a/images/build_images.sh
+++ b/images/build_images.sh
@@ -1,15 +1,18 @@
 #!/usr/bin/env bash
 
 builddate=$(date +%Y%m%d-%H%M%S)
 
 username=$(docker info | grep Username | awk '{print $2}')
 
 for img in base web; do
   docker build --build-arg SWH_VER=${builddate} --build-arg debianversion=buster -t softwareheritage/${img}:${builddate} -f ${img}/Dockerfile .
   docker tag softwareheritage/${img}:${builddate} softwareheritage/${img}:latest
-  if [[ X${username} = Xsoftwareheritage ]]; then
-    docker push softwareheritage/${img}:${builddate}
-    docker push softwareheritage/${img}:latest
+  if [[ "${username}" = "softwareheritage" ]] && [[ "${PUBLISH:=no}" = "yes" ]]; then
+	  echo "Publishing image softwareheritage/${img}:${builddate} on docker hub"
+      docker push softwareheritage/${img}:${builddate}
+      docker push softwareheritage/${img}:latest
   fi
 done
 
+echo "Done creating images. You may want to use"
+echo "export SWH_IMAGE_TAG=${builddate}"