diff --git a/Documents/Shore/cleanup/docker-clean b/Documents/Shore/cleanup/docker-clean
index 1a00e1d6d5d4992dcd191d0bced6698e31d6a4d3..fbbb855ee0741fbe81175c2ddce40eca2f741841 100755
--- a/Documents/Shore/cleanup/docker-clean
+++ b/Documents/Shore/cleanup/docker-clean
@@ -1,7 +1,8 @@
 #!/bin/sh
-# shellcheck disable=SC2046
+# Deliberately don't set -e, allow failures to continue silently.
 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
+
+docker ps --quiet --filter=status=exited | xargs -r docker rm --volumes 2>/dev/null
+docker ps --quiet --filter=status=created | xargs -r docker rm --volumes 2>/dev/null
+docker images --quiet --filter=dangling=true | xargs -r docker rmi 2>/dev/null
+docker volume ls --quiet --filter=dangling=true | xargs -r docker volume rm 2>/dev/null
diff --git a/Documents/Shore/cleanup/docker-update b/Documents/Shore/cleanup/docker-update
index f1d8fdae37fb02c2c2adee78d28f06ffc3a75900..fbe872158559226b639c89e7198bb9e1b4b636bd 100755
--- a/Documents/Shore/cleanup/docker-update
+++ b/Documents/Shore/cleanup/docker-update
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -eu
-for image in $(docker images | awk '$1!="<none>" && NR>1 {printf("%s:%s\n", $1, $2)}')
+for image in $(docker images --format '{{.Repository}}:{{.Tag}}')
 do
     docker pull "$image" || echo "Skipping..."
 done