diff --git a/rails-prod.sh b/rails-prod.sh
index 3d83e26..4f42d55 100755
--- a/rails-prod.sh
+++ b/rails-prod.sh
@@ -6,8 +6,8 @@ if [ $# != 1 ]; then
   exit 1
 fi
 
-docker kill $1
-docker rm $1
 docker build -t $1 -f rails-prod-Dockerfile .
 
+docker kill $(docker ps -q)
+
 docker run -h $HOSTNAME --name $1 -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE -v /srv/docker/apache2/logs:/var/log/apache2  -v /etc/localtime:/etc/localtime -p 80:80 -p 443:443 $1
diff --git a/rails-worker-prod.sh b/rails-worker-prod.sh
index 36dfbdd..79dac19 100755
--- a/rails-worker-prod.sh
+++ b/rails-worker-prod.sh
@@ -6,8 +6,8 @@ if [ $# != 1 ]; then
   exit 1
 fi
 
-docker kill $1
-docker rm $1
 docker build -t $1 -f rails-prod-Dockerfile .
 
+docker kill $(docker ps -q)
+
 docker run -h $HOSTNAME --name $1 -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE -v /etc/localtime:/etc/localtime $1 bundle exec rake jobs:work RAILS_ENV=production
\ No newline at end of file