diff --git a/plugin.sh b/plugin.sh
index 489c2a9..2e72842 100755
--- a/plugin.sh
+++ b/plugin.sh
@@ -67,15 +67,13 @@ run_stack_wait() {
 run_purge() {
   echo "--- start purge ---"
   docker -H "$DOCKER_HOST" stack rm "$PLUGIN_STACK"
-  echo "--- end purge ---"
-}
 
-run_cleanup() {
-  echo "--- start cleanup ---"
   # See https://github.com/moby/moby/issues/30942#issuecomment-540699206
   until [ -z "$(docker stack ps "$PLUGIN_STACK" -q)" ]; do sleep 1; done
   docker -H "$DOCKER_HOST" system prune --all --volumes --force
-  docker -H "$DOCKER_HOST" secret rm "$(docker -H "$DOCKER_HOST" secret ls -q)" || true
+
+  # try and remove all secrets; Docker will leave ones which are in use
+  docker -H "$DOCKER_HOST" secret ls --format '{{ .Name }}' | xargs -i sh -c "echo {}; docker -H \"$DOCKER_HOST\" secret rm {} || true"
   echo "--- end cleanup ---"
 }