diff --git a/run b/run
index ecc20ed..d47dd52 100755
--- a/run
+++ b/run
@@ -1,16 +1,18 @@
 #!/bin/sh
 # Run the my_ocrd_workflow container on the current workspace
 
-# The container currently needs to run privileged to allow it to read from e.g.
-# /home on SELinux secured systems such as Fedora. We might want to use udica
-# instead in the future.
+set -e  # Abort on error
 
-DOCKER_IMAGE=my_ocrd_workflow:latest  # locally built
+DOCKER_IMAGE=${DOCKER_IMAGE:-my_ocrd_workflow:latest}  # default to locally built
 
 if echo "$DOCKER_IMAGE" | grep -q "/"; then
   docker pull "$DOCKER_IMAGE"
 fi
 
+# The container currently needs to run privileged to allow it to read from e.g.
+# /home on SELinux secured systems such as Fedora. We might want to use udica
+# instead in the future.
+
 docker run --privileged=true --rm -t \
   \
   --user `id -u`:`id -g` \
diff --git a/run-docker-hub b/run-docker-hub
index 8295525..7cee74f 100755
--- a/run-docker-hub
+++ b/run-docker-hub
@@ -5,16 +5,4 @@
 # /home on SELinux secured systems such as Fedora. We might want to use udica
 # instead in the future.
 
-DOCKER_IMAGE=mikegerber/my_ocrd_workflow:stable
-
-if echo "$DOCKER_IMAGE" | grep -q "/"; then
-  docker pull "$DOCKER_IMAGE"
-fi
-
-docker run --privileged=true --rm -t \
-  \
-  --user `id -u`:`id -g` \
-  --mount type=bind,src="$(pwd)",target=/data \
-  \
-  -e LOG_LEVEL=$LOG_LEVEL \
-  $DOCKER_IMAGE
+DOCKER_IMAGE=mikegerber/my_ocrd_workflow:stable `dirname $0`/run