diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit
index 22abfa98abf..d7eaaeb527c 100644
--- a/.buildkite/hooks/pre-exit
+++ b/.buildkite/hooks/pre-exit
@@ -17,7 +17,9 @@ if [[ "$BUILDKITE_AGENT_META_DATA_QUEUE" == "bazel" ]]; then
 
   # Remove any hanging containers and/or volumes to ensure the next tests are able to run.
   if [[ $(docker ps -aq | wc -l) -gt 0 ]]; then
-    docker rm -f "$(docker ps -aq)"
+    echo "Removing docker containers..."
+    mapfile -t containers < <(docker ps -aq)
+    for c in "${containers[@]}"; do docker rm -f "$c"; done
   fi
   if [[ $(docker volume ls -q) -gt 0 ]]; then
     docker volume rm "$(docker volume ls -q)"