diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..fbcd3022
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,4 @@
+ansible==1.9.0.1
+ansible-lint
+dopy
+boto
diff --git a/roles/consul/tasks/main.yml b/roles/consul/tasks/main.yml
index a8566f14..0e9b5693 100644
--- a/roles/consul/tasks/main.yml
+++ b/roles/consul/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # tasks file for consul
 - name: remove consul override
-  command: /bin/rm -f /etc/init/consul.override
+  file: path=/etc/init/consul.override state=absent
 
 - name: start consul
   service: name=consul state=started
@@ -24,7 +24,7 @@
     - consul
 
 - name: remove consul-join override
-  command: /bin/rm -f /etc/init/consul-join.override
+  file: path=/etc/init/consul-join.override state=absent
   when: consul_join is defined
 
 - name: configure consul-join
diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml
index 29822b92..aa767f76 100644
--- a/roles/dnsmasq/tasks/main.yml
+++ b/roles/dnsmasq/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # tasks file for dnsmasq
 - name: remove dnsmasq override
-  command: /bin/rm -f /etc/init/dnsmasq.override
+  file: path=/etc/init/dnsmasq.override state=absent
 
 - name: ensure dnsmasq is running (and enable it at boot)
   service: name=dnsmasq state=started enabled=yes
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 92698484..a7a3e42e 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # tasks file for docker
 - name: remove docker override
-  command: /bin/rm -f /etc/init/docker.override
+  file: path=/etc/init/docker.override state=absent
 
 - name: ensure docker is running (and enable it at boot)
   service: name=docker state=started enabled=yes
diff --git a/roles/marathon/tasks/main.yml b/roles/marathon/tasks/main.yml
index 098c031a..04d791a1 100644
--- a/roles/marathon/tasks/main.yml
+++ b/roles/marathon/tasks/main.yml
@@ -8,7 +8,7 @@
   sudo: yes
 
 - name: remove marathon override
-  command: /bin/rm -f /etc/init/marathon.override
+  file: path=/etc/init/marathon.override state=absent
 
 - name: ensure marathon is running (and enable it at boot)
   service: name=marathon state=started enabled=yes
diff --git a/roles/mesos/tasks/main.yml b/roles/mesos/tasks/main.yml
index 225904cd..e4e5e808 100644
--- a/roles/mesos/tasks/main.yml
+++ b/roles/mesos/tasks/main.yml
@@ -30,7 +30,7 @@
   when: mesos_install_mode == "master"
 
 - name: remove mesos-master override
-  command: /bin/rm -f /etc/init/mesos-master.override
+  file: path=/etc/init/mesos-master.override state=absent
   when: mesos_install_mode == "master"
 
 - name: Set Mesos Master Cluster name
@@ -62,7 +62,7 @@
   when: mesos_install_mode == "slave"
 
 - name: remove mesos-slave override
-  command: /bin/rm -f /etc/init/mesos-slave.override
+  file: path=/etc/init/mesos-slave.override state=absent
   when: mesos_install_mode == "slave"
 
 - name: set executor registration timeout
diff --git a/wercker.yml b/wercker.yml
index 0769dddf..1fa71b04 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -1,10 +1,10 @@
-box: wercker/ruby
+box: wercker/python
 no-response-timeout: 15
 build:
   steps:
-    - bundle-install
     - install-packages:
         packages: wget unzip
+    - pip-install
     - script:
         name: install packer
         cwd: packer/
@@ -14,10 +14,20 @@ build:
           ./packer version
     - script:
         cwd: packer/
-        name: validate packer template
+        name: validate packer template for AMI
         code: ./packer validate ubuntu-14.04_amd64-amis.json
     - script:
-        name: build image
         cwd: packer/
-        code: |
-          ./packer build ubuntu-14.04_amd64-amis.json
+        name: validate packer template for Digitalocean
+        code: ./packer validate ubuntu-14.04_amd64-droplet.json
+    - script:
+        cwd: packer/
+        name: validate packer template for Vagrant
+        code: ./packer validate ubuntu-14.04_amd64.json
+    - script:
+        cwd: packer/
+        name: validate packer template for Google
+        code: ./packer validate ubuntu-14.04_amd64-google.json
+    - capgemini/ansible-lint:
+        name: run ansible-lint against the site.yml playbook
+        playbook: site.yml