diff --git a/rails-prod.sh b/rails-prod.sh
index 8aaa95f..cb3ba96 100755
--- a/rails-prod.sh
+++ b/rails-prod.sh
@@ -9,8 +9,10 @@ fi
 docker build -t $1 -f rails-prod-Dockerfile .
 
 #Kill and remove containers gracefully without error if none are running
-docker ps -a | grep "Exit" | awk '{print $1}' | while read -r id ; do
+docker ps | grep "Exit" | awk '{print $1}' | while read -r id ; do
   docker kill $id
+done
+docker ps -a | grep "Exit" | awk '{print $1}' | while read -r id ; do
   docker rm $id
 done
 
diff --git a/rails-worker-prod.sh b/rails-worker-prod.sh
index 4e5bd25..30ea91e 100755
--- a/rails-worker-prod.sh
+++ b/rails-worker-prod.sh
@@ -9,8 +9,10 @@ fi
 docker build -t $1 -f rails-prod-Dockerfile .
 
 #Kill and remove containers gracefully without error if none are running
-docker ps -a | grep "Exit" | awk '{print $1}' | while read -r id ; do
+docker ps | grep "Exit" | awk '{print $1}' | while read -r id ; do
   docker kill $id
+done
+docker ps -a | grep "Exit" | awk '{print $1}' | while read -r id ; do
   docker rm $id
 done