diff --git a/roles/rails/tasks/vars.yml b/roles/rails/tasks/vars.yml
index b6c9a03..030cdf5 100644
--- a/roles/rails/tasks/vars.yml
+++ b/roles/rails/tasks/vars.yml
@@ -9,42 +9,42 @@
   shell: echo export WRESTLINGDEV_ENV_FILE=/root/prod.env
 
 - name: Set env file permanently
-  shell: echo export WRESTLINGDEV_ENV_FILE=/root/prod.env >> /etc/environment
+  shell: echo WRESTLINGDEV_ENV_FILE=/root/prod.env >> /etc/environment
 
 - name: Set DB Name
-  shell: echo export WRESTLINGDEV_DB_NAME={{ lookup('env', 'WRESTLINGDEV_DB_NAME') }} >> /root/prod.env
+  shell: echo WRESTLINGDEV_DB_NAME={{ lookup('env', 'WRESTLINGDEV_DB_NAME') }} >> /root/prod.env
 
 - name: Set db password
-  shell: echo export WRESTLINGDEV_DB_PWD={{ lookup('env', 'WRESTLINGDEV_DB_PWD') }} >> /root/prod.env
+  shell: echo WRESTLINGDEV_DB_PWD={{ lookup('env', 'WRESTLINGDEV_DB_PWD') }} >> /root/prod.env
 
 
 - name: Set db username
-  shell: echo export WRESTLINGDEV_DB_USR={{ lookup('env', 'WRESTLINGDEV_DB_USR') }} >> /root/prod.env
+  shell: echo WRESTLINGDEV_DB_USR={{ lookup('env', 'WRESTLINGDEV_DB_USR') }} >> /root/prod.env
 
 
 - name: Set db host
-  shell: echo export WRESTLINGDEV_DB_HOST={{ lookup('env', 'WRESTLINGDEV_DB_HOST') }} >> /root/prod.env
+  shell: echo WRESTLINGDEV_DB_HOST={{ lookup('env', 'WRESTLINGDEV_DB_HOST') }} >> /root/prod.env
 
 - name: Set db port
-  shell: echo export WRESTLINGDEV_DB_PORT={{ lookup('env', 'WRESTLINGDEV_DB_PORT') }} >> /root/prod.env
+  shell: echo WRESTLINGDEV_DB_PORT={{ lookup('env', 'WRESTLINGDEV_DB_PORT') }} >> /root/prod.env
 
 - name: Set devise secret key
-  shell: echo export WRESTLINGDEV_DEVISE_SECRET_KEY={{ lookup('env', 'WRESTLINGDEV_DEVISE_SECRET_KEY') }} >> /root/prod.env
+  shell: echo WRESTLINGDEV_DEVISE_SECRET_KEY={{ lookup('env', 'WRESTLINGDEV_DEVISE_SECRET_KEY') }} >> /root/prod.env
 
 - name: Set secret key base
-  shell: echo export WRESTLINGDEV_SECRET_KEY_BASE={{ lookup('env', 'WRESTLINGDEV_SECRET_KEY_BASE') }} >> /root/prod.env
+  shell: echo WRESTLINGDEV_SECRET_KEY_BASE={{ lookup('env', 'WRESTLINGDEV_SECRET_KEY_BASE') }} >> /root/prod.env
 
 - name: Set new relic license
-  shell: echo export WRESTLINGDEV_NEW_RELIC_LICENSE_KEY={{ lookup('env', 'WRESTLINGDEV_NEW_RELIC_LICENSE_KEY') }} >> /root/prod.env
+  shell: echo WRESTLINGDEV_NEW_RELIC_LICENSE_KEY={{ lookup('env', 'WRESTLINGDEV_NEW_RELIC_LICENSE_KEY') }} >> /root/prod.env
 
 - name: Set memcached username
-  shell: echo export MEMCACHIER_USERNAME={{ lookup('env', 'MEMCACHIER_USERNAME') }} >> /root/prod.env
+  shell: echo MEMCACHIER_USERNAME={{ lookup('env', 'MEMCACHIER_USERNAME') }} >> /root/prod.env
 
 - name: Set memcached password
-  shell: echo export MEMCACHIER_PASSWORD={{ lookup('env', 'MEMCACHIER_PASSWORD') }} >> /root/prod.env
+  shell: echo MEMCACHIER_PASSWORD={{ lookup('env', 'MEMCACHIER_PASSWORD') }} >> /root/prod.env
 
 - name: Set memcached servers
-  shell: echo export MEMCACHIER_SERVERS={{ lookup('env', 'MEMCACHIER_SERVERS') }} >> /root/prod.env
+  shell: echo MEMCACHIER_SERVERS={{ lookup('env', 'MEMCACHIER_SERVERS') }} >> /root/prod.env
 
 - name: Set email password
-  shell: echo export WRESTLINGDEV_EMAIL_PWD={{ lookup('env', 'WRESTLINGDEV_EMAIL_PWD') }} >> /root/prod.env
+  shell: echo WRESTLINGDEV_EMAIL_PWD={{ lookup('env', 'WRESTLINGDEV_EMAIL_PWD') }} >> /root/prod.env
diff --git a/roles/rails/tasks/web.yml b/roles/rails/tasks/web.yml
index 676279d..fffe8ca 100644
--- a/roles/rails/tasks/web.yml
+++ b/roles/rails/tasks/web.yml
@@ -2,8 +2,8 @@
 # This task clones the repo and runs the webserver docker container.
 
 - name: Copy the code from repository
-   git: repo={{ repository }} dest=/root/wrestlingApp
+  git: repo={{ repository }} dest=/root/wrestlingApp
 
 - name: Create and start apache docker image
-  shell: cd /root/wrestlingApp && bash rails-prod.sh wrestlingdev-web
+  command: chdir=/root/wrestlingApp bash rails-prod.sh wrestlingdev-web
 
diff --git a/roles/rails/tasks/worker.yml b/roles/rails/tasks/worker.yml
index 43c9dfd..ff539f9 100644
--- a/roles/rails/tasks/worker.yml
+++ b/roles/rails/tasks/worker.yml
@@ -2,7 +2,7 @@
 # This task clones the repo and runs the worker docker container.
 #
 - name: Copy the code from repository
-   git: repo={{ repository }} dest=/root/wrestlingApp
+  git: repo={{ repository }} dest=/root/wrestlingApp
 
 - name: Create and run delayed job worker
-  shell: cd /root/wrestlingApp && bash rails-worker-prod.sh wrestlingdev-worker
+  command: chdir=/root/wrestlingApp bash rails-prod.sh wrestlingdev-worker