diff --git a/playbooks/code-deploy.yml b/playbooks/code-deploy.yml
index 85d10fb..43c5a80 100644
--- a/playbooks/code-deploy.yml
+++ b/playbooks/code-deploy.yml
@@ -16,19 +16,16 @@
     - name: Create apache docker image
       command: chdir=/root/wrestlingApp docker build -t wrestlingdev-web -f rails-prod-Dockerfile .
 
-    - name: Is wrestlingdev running
-      command: docker ps | grep wrestlingdev
-      register: wrestlingdev_running
+    - name: Kill container
+      command: docker stop wrestlingdev-web
       ignore_errors: yes
 
-    - name: Kill and remove container
-      command: docker stop $(docker ps -a -q) && docker rm $(docker ps -a -q)
-      #when: wrestlingdev_running != ""
+    - name: Remove container
+      command: docker rm wrestlingdev-web
       ignore_errors: yes
 
     - name: Start docker container
       command: docker run -h {{ansible_hostname}} --name wrestlingdev-web -d --restart=always --env-file /root/prod.env -v /srv/docker/apache2/logs:/var/log/apache2  -v /etc/localtime:/etc/localtime -p 80:80 -p 443:443 wrestlingdev-web
-      #when: wrestlingdev_running == ""
       ignore_errors: yes
 
 - hosts: worker
@@ -45,17 +42,14 @@
    - name: Create apache docker image
      command: chdir=/root/wrestlingApp docker build -t wrestlingdev-worker -f rails-prod-Dockerfile .
 
-    - name: Is wrestlingdev running
-      command: docker ps | grep wrestlingdev
-      register: wrestlingdev_running
-      ignore_errors: yes
+   - name: Kill container
+     command: docker stop wrestlingdev-worker
+     ignore_errors: yes
 
-    - name: Kill and remove container
-      command: docker stop $(docker ps -a -q) && docker rm $(docker ps -a -q)
-      #when: wrestlingdev_running != ""
-      ignore_errors: yes
+   - name: Remove container
+     command: docker rm wrestlingdev-worker
+     ignore_errors: yes
 
    - name: Start docker container
      command: docker run -h {{ansible_hostname}} --name wrestlingdev-worker -d --restart=always --env-file /root/prod.env -v /etc/localtime:/etc/localtime wrestlingdev-worker bundle exec rake jobs:work RAILS_ENV=production
-     #when: wrestlingdev_running == ""
      ignore_errors: yes