diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 034f196..ffafec3 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -5,7 +5,7 @@
   apt: update_cache=yes
 
 - name: Upgrade APT to the lastest packages
-  apt: upgrade=safe
+  apt: upgrade=dist
 
 - name: Install htop
   apt: name=htop state=present
@@ -49,18 +49,19 @@
 - name: Is docker installed
   shell: which docker
   register: docker_installed
+  failed_when: "docker_installed.rc == 2 or docker_installed.rc == 3"
 
 - name: Get docker
   shell: curl -sSL https://get.docker.com/ | sh
-  when: docker_install is none
+  when: docker_installed.stdout == ""
 
 - name: Get docker compose
   shell: curl -L https://github.com/docker/compose/releases/download/1.5.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose  
-  when: docker_install is none
+  when: docker_installed.stdout == ""
 
 - name: Link docker compose
   shell: chmod +x /usr/local/bin/docker-compose
-  when: docker_install is none
+  when: docker_installed.stdout == ""
 
 - name: Set timezone to NewYork
   shell: timedatectl set-timezone America/New_York
diff --git a/roles/developer-machine/tasks/main.yml b/roles/developer-machine/tasks/main.yml
index 7a61fab..8f00c2c 100644
--- a/roles/developer-machine/tasks/main.yml
+++ b/roles/developer-machine/tasks/main.yml
@@ -4,22 +4,24 @@
 - name: Is rvm installed
   shell: which rvm
   register: rvm_installed
+  failed_when: "rvm_installed.rc == 2 or rvm_installed.rc == 3"
 
 - name: Install rvm key
   shell: gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
-  when: rvm_installed is none
+  when: rvm_installed.stdout == ""
 
 - name: Install rvm and latest ruby
   shell: \curl -sSL https://get.rvm.io | bash -s stable
-  when: rvm_installed is none
+  when: rvm_installed.stdout == ""
 
 - name: Is heroku installed
   shell: which heroku
   register: heroku_installed
+  failed_when: "heroku_installed.rc == 2 or heroku_installed.rc == 3"
 
 - name: Install heroku toolbelt
   shell: wget -O- https://toolbelt.heroku.com/install-ubuntu.sh | sh
-  when: heroku_installed is none
+  when: heroku_installed.stdout == ""
 
 - name: Install siege
   apt: name=siege state=present
diff --git a/site.retry b/site.retry
new file mode 100644
index 0000000..f531284
--- /dev/null
+++ b/site.retry
@@ -0,0 +1 @@
+codydev