diff --git a/Makefile b/Makefile
index 367908ef9..de0d094db 100644
--- a/Makefile
+++ b/Makefile
@@ -112,9 +112,12 @@ deploy_staging:
 staging: deploy_staging
 celery_stop:
 	- ansible-playbook ansible/deploy.yml -l task --tags stop
+
 # Provision
 firewall:
-	- ansible-playbook ansible/setup.yml -l db --tags firewall
+	- ansible-playbook ansible/all.yml -l db --tags firewall
+oldfirewall:
+	- ANSIBLE_CONFIG=/srv/newsblur/ansible.old.cfg ansible-playbook ansible/all.yml  -l db --tags firewall
 
 # performance tests
 perf-cli:
diff --git a/ansible/all.yml b/ansible/all.yml
new file mode 100644
index 000000000..6bc1dabf7
--- /dev/null
+++ b/ansible/all.yml
@@ -0,0 +1,17 @@
+# Use this playbook to run a tag on every server. Handy for firewalls.
+
+---
+- hosts: all
+  # strategy: free
+  vars_files:
+    - env_vars/base.yml
+  vars:
+    - update_apt_cache: yes
+  roles:
+    - {role: 'base', tags: 'base'}
+    - {role: 'docker', tags: 'docker'}
+    - {role: 'repo', tags: 'repo'}
+    - {role: 'dnsmasq', tags: 'dnsmasq'}
+    - {role: 'consul', tags: 'consul'}
+    - {role: 'consul-client', tags: 'consul'}
+    - {role: 'monitor', tags: 'monitor'}
diff --git a/ansible/playbooks/env_vars b/ansible/playbooks/env_vars
new file mode 120000
index 000000000..5121b5d91
--- /dev/null
+++ b/ansible/playbooks/env_vars
@@ -0,0 +1 @@
+../env_vars
\ No newline at end of file
diff --git a/ansible/playbooks/group_vars b/ansible/playbooks/group_vars
new file mode 120000
index 000000000..cc7e7a90f
--- /dev/null
+++ b/ansible/playbooks/group_vars
@@ -0,0 +1 @@
+../group_vars
\ No newline at end of file