diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index c40b5ea79f..d28b20a73d 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -21,6 +21,8 @@
   - fas_client
   - rkhunter
   - nagios_client
+  - { role: ec2_proxy,
+      when: inventory_hostname in groups['ec2'] }
   - collectd/base
   - sudo
   - rsyncd
diff --git a/roles/ec2_proxy/README b/roles/ec2_proxy/README
new file mode 100644
index 0000000000..feda8e58dd
--- /dev/null
+++ b/roles/ec2_proxy/README
@@ -0,0 +1 @@
+For things that only need to happen on ec2 proxies like mounting drives
diff --git a/roles/ec2_proxy/tasks/main.yml b/roles/ec2_proxy/tasks/main.yml
new file mode 100644
index 0000000000..df185edc66
--- /dev/null
+++ b/roles/ec2_proxy/tasks/main.yml
@@ -0,0 +1,15 @@
+---
+- name: Create partition for /srv
+  parted: device=/dev/nvme1n1 number=1 state=present
+  tags:
+  - ec2_proxy
+
+- name: Make it ext3
+  filesystem: fstype=ext3 dev=/dev/nvme1n1p1
+  tags:
+  - ec2_proxy
+
+- name: mount /srv
+  mount: name=/srv src=/dev/nvme1n1p1 fstype=ext3 state=mounted
+  tags:
+  - ec2_proxy