diff --git a/playbooks/groups/lockbox.yml b/playbooks/groups/lockbox.yml
index c2ecaf5933..979dd682bc 100644
--- a/playbooks/groups/lockbox.yml
+++ b/playbooks/groups/lockbox.yml
@@ -2,7 +2,6 @@
   hosts: lockbox
   user: root
   gather_facts: False
-  accelerate: True
 
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
@@ -11,7 +10,6 @@
 
   tasks:
   - include: "{{ tasks }}/virt_instance_create.yml"
-  - include: "{{ tasks }}/accelerate_prep.yml"
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
@@ -20,7 +18,6 @@
   hosts: lockbox
   user: root
   gather_facts: True
-  accelerate: True
 
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
@@ -33,6 +30,7 @@
   - /srv/web/infra/ansible/roles/denyhosts
   - /srv/web/infra/ansible/roles/nagios_client
   - /srv/web/infra/ansible/roles/fas_client
+  - /srv/web/infra/ansible/roles/ansible-server
 
   tasks:
   - include: "{{ tasks }}/hosts.yml"
diff --git a/roles/ansible-server/tasks/main.yml b/roles/ansible-server/tasks/main.yml
new file mode 100644
index 0000000000..ab7f2d9951
--- /dev/null
+++ b/roles/ansible-server/tasks/main.yml
@@ -0,0 +1,18 @@
+---
+#
+# Setup ansible-server instance
+#
+- name: install needed packages
+  yum: pkg={{ item }} state=installed
+  with_items:
+  - ansible
+  - git
+  tags:
+  - packages
+
+#
+# TODO:
+#  cgit? 
+#  rbac-playbook?
+#  zodbot notifications?
+#