diff --git a/Documents/Shore/cleanup/docker-clean b/Documents/Shore/cleanup/docker-clean
index 6c9bb73009e2c47d6d1d4d8cbc58b97c4eda7768..1a00e1d6d5d4992dcd191d0bced6698e31d6a4d3 100755
--- a/Documents/Shore/cleanup/docker-clean
+++ b/Documents/Shore/cleanup/docker-clean
@@ -1,5 +1,7 @@
 #!/bin/sh
-docker rm "$(docker ps --quiet --filter=status=exited)" 2>/dev/null || true
-docker rm "$(docker ps --quiet --filter=status=created)" 2>/dev/null || true
-docker rmi "$(docker images --quiet --filter=dangling=true)" 2>/dev/null || true
-docker volume rm "$(docker volume ls --quiet --filter=dangling=true)" 2>/dev/null || true
+# shellcheck disable=SC2046
+set -u
+docker rm $(docker ps --quiet --filter=status=exited) 2>/dev/null
+docker rm $(docker ps --quiet --filter=status=created) 2>/dev/null
+docker rmi $(docker images --quiet --filter=dangling=true) 2>/dev/null
+docker volume rm $(docker volume ls --quiet --filter=dangling=true) 2>/dev/null
diff --git a/Documents/Shore/cleanup/docker-update b/Documents/Shore/cleanup/docker-update
index 01a2c993b5e54c11835e5a1735d36d52afc9845d..f1d8fdae37fb02c2c2adee78d28f06ffc3a75900 100755
--- a/Documents/Shore/cleanup/docker-update
+++ b/Documents/Shore/cleanup/docker-update
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -eu
 for image in $(docker images | awk '$1!="<none>" && NR>1 {printf("%s:%s\n", $1, $2)}')
 do
     docker pull "$image" || echo "Skipping..."