diff --git a/README.md b/README.md
index edf28d6c5b6ce7192c8e57f73a8abfade10f7176..e555132ce93162a860008404867643128c8e108e 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,8 @@ $ ./buildweb.sh
 $ ./buildimage.sh 2020061000
 ```
 
+The image should then be available as `goemaxima:2020061000-dev`.
+
 
 License
 =======
diff --git a/build.sh b/build.sh
index fe87eda4c44dbf682deee4b64cbb56c27d377bca..363ab44501487488807057a33a138aeb447130cb 100755
--- a/build.sh
+++ b/build.sh
@@ -2,5 +2,5 @@ REGISTRY=$1
 grep -v '^#' versions | cut -f1 | \
 while read -r ver; do
 	goemaxima_version="$2"
-	bash ./buildimage.sh "$ver" "${REGISTRY}" "$goemaxima_version" || exit 1
+	./buildimage.sh "$ver" "${REGISTRY}" "$goemaxima_version" || exit 1
 done
diff --git a/buildimage.sh b/buildimage.sh
index 8531a52fc8bdad08d24faafba28aa71adb1d4210..9708447c4439fdcfd17441e3ca07893b7e8e1f3a 100755
--- a/buildimage.sh
+++ b/buildimage.sh
@@ -6,10 +6,11 @@ stackver="$1"
 if [ -z "$stackver" ]; then
 	echo "Stack version is missing"
 	echo "Usage: $0 stackmaximaversion [registry] [containerversion]"
+	exit 1
 fi
 verstring=$(awk '$1 == "'"$1"'"{ print $0 }' versions)
-sbclver="$(echo "$verstring" | cut -f2)"
-maximaver="$(echo "$verstring" | cut -f3)"
+maximaver="$(echo "$verstring" | cut -f2)"
+sbclver="$(echo "$verstring" | cut -f3)"
 goemaxver="$(cat goemaxima_version)"
 libpath="stack/$stackver/maxima"
 echo "starting to build image for:"
@@ -23,11 +24,11 @@ if [ -n "$REG" ]; then
 	docker pull "$2/$IMAGENAME-dev"
 fi
 # build it
-docker build -t "${IMAGENAME}" --build-arg MAXIMA_VERSION="$maximaver" --build-arg SBCL_VERSION="$sbclver" --build-arg LIB_PATH="$libpath" . || exit 1
+docker build -t "${IMAGENAME}-dev" --build-arg MAXIMA_VERSION="$maximaver" --build-arg SBCL_VERSION="$sbclver" --build-arg LIB_PATH="$libpath" . || exit 1
 echo "${IMAGENAME} wurde erfolgreich gebaut."
 # push the image
 if [ -n "$REG" ]; then
-	docker tag "$IMAGENAME" "$2/$IMAGENAME-dev"
+	docker tag "$IMAGENAME-dev" "$2/$IMAGENAME-dev"
 	docker push "$2/$IMAGENAME-dev"
 	if [ -n "$3" ]; then
 		docker tag "$IMAGENAME" "$2/$IMAGENAME-$3"
diff --git a/buildscript.sh b/buildscript.sh
index a3f0f43738dcf7ceb5e3f6bbde22274bb8015775..47dc6cfc5e7f38e8d37da0b485b75c5e2ca12621 100644
--- a/buildscript.sh
+++ b/buildscript.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 echo ${MAXIMA_VERSION?Error \$MAXIMA_VERSION is not defined} \
      ${SBCL_VERSION?Error \$SBCL_VERSION is not defined}