diff --git a/files/twisted/ssh-pub-key b/files/twisted/ssh-pub-key
new file mode 100644
index 0000000000..01232559f6
--- /dev/null
+++ b/files/twisted/ssh-pub-key
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDxFYkms3bEGIGpH0Dg0JgvsdHI/pWkS4ynCn/poyVcKc+SL1StKoOFPzzFh7dGVIeQ6q8MLbm246H8Swx57R13Q3bhtTs5Gpy5bNC7HejkWbrrMEJuKxVKhIintbC+tT04OFBFklVePuxacsc3EBdTHSnz9o41MfJnjv58VxJB5bwfgsV7FMDLHnBpujlPPH1hZG5A0fwD8VgCwaRVirIs9Kw35yKEUm8D76vOxjAqm7UTexEcPNFb4tYGzI00hbPS374FzoO4ZuXxv1ymakw9iyL54Hwbyj8JxBbgfZ6TvgLSSN9OU+KRqz1NqfepSj+y8up0Q+W8J5UObvf02VZrJKVgnIVe5gw4iDx/5E7F4qmf8qa5YUlJnP3LWRz6jhtQE+m6Ro7zItnoqPR3EtQZ9rMgaS1+/qPX7hcB35hlGZbhj0IDY+HE98ehUivUuxSoLOp8c+COaJ2b5+wSQigi9jRYx0qPeCOCCtA8vF8z4SOmD3I6IsPzlCiejeC5y3tWoQqJPR430TPBJ7CMNbbHPNF8GyzM7vFukqSpgacLq1f/YgBwqiRLVk+ktgUM/+fHuE6mUDMdE+Ag2lfwHnLI7DOwaJdr7JoAoSi6R+uTRhx1d4AET1sMv/HXKD+4Abu0WyaT3l/xO+hBABz+KO33gPUdCsKOw7lvJFZRC+OSyQ==
diff --git a/inventory/host_vars/arm04-builder00.arm.fedoraproject.org b/inventory/host_vars/arm04-builder00.arm.fedoraproject.org
new file mode 100644
index 0000000000..0ddade218a
--- /dev/null
+++ b/inventory/host_vars/arm04-builder00.arm.fedoraproject.org
@@ -0,0 +1,7 @@
+---
+#
+# We need to mount koji storage rw here so run_root can work.
+# The rest of the group can be ro, it's only builders in the
+# compose channel that need a rw mount
+
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
diff --git a/inventory/host_vars/arm04-builder01.arm.fedoraproject.org b/inventory/host_vars/arm04-builder01.arm.fedoraproject.org
new file mode 100644
index 0000000000..0ddade218a
--- /dev/null
+++ b/inventory/host_vars/arm04-builder01.arm.fedoraproject.org
@@ -0,0 +1,7 @@
+---
+#
+# We need to mount koji storage rw here so run_root can work.
+# The rest of the group can be ro, it's only builders in the
+# compose channel that need a rw mount
+
+nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
diff --git a/inventory/host_vars/twisted-fedora21-1.fedorainfracloud.org b/inventory/host_vars/twisted-fedora21-1.fedorainfracloud.org
new file mode 100644
index 0000000000..3ca8109266
--- /dev/null
+++ b/inventory/host_vars/twisted-fedora21-1.fedorainfracloud.org
@@ -0,0 +1,17 @@
+---
+image: "{{ fedora21_x86_64 }}"
+instance_type: m1.medium
+keypair: fedora-admin-20130801
+security_group: ssh-anywhere-pythonbots,icmp-anywhere-pythonbots,default
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: pythonbots
+inventory_instance_name: twisted-fedora21-1
+hostbase: twisted-fedora21-1
+public_ip: 209.132.184.135
+description: twisted buildbot for fedora 21
+
+cloud_networks:
+  # pythonbots-net
+  - net-id: "36ca66de-001d-4807-a688-58c363d84d68"
diff --git a/inventory/host_vars/twisted-fedora21-2.fedorainfracloud.org b/inventory/host_vars/twisted-fedora21-2.fedorainfracloud.org
new file mode 100644
index 0000000000..e1d9f6b29f
--- /dev/null
+++ b/inventory/host_vars/twisted-fedora21-2.fedorainfracloud.org
@@ -0,0 +1,17 @@
+---
+image: "{{ fedora21_x86_64 }}"
+instance_type: m1.medium
+keypair: fedora-admin-20130801
+security_group: ssh-anywhere-pythonbots,icmp-anywhere-pythonbots,default
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: pythonbots
+inventory_instance_name: twisted-fedora21-2
+hostbase: twisted-fedora21-2
+public_ip: 209.132.184.136
+description: twisted buildbot for fedora 21
+
+cloud_networks:
+  # pythonbots-net
+  - net-id: "36ca66de-001d-4807-a688-58c363d84d68"
diff --git a/inventory/host_vars/twisted-fedora22-1.fedorainfracloud.org b/inventory/host_vars/twisted-fedora22-1.fedorainfracloud.org
new file mode 100644
index 0000000000..f3e38efe14
--- /dev/null
+++ b/inventory/host_vars/twisted-fedora22-1.fedorainfracloud.org
@@ -0,0 +1,17 @@
+---
+image: "{{ fedora22_x86_64 }}"
+instance_type: m1.medium
+keypair: fedora-admin-20130801
+security_group: ssh-anywhere-pythonbots,icmp-anywhere-pythonbots,default
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: pythonbots
+inventory_instance_name: twisted-fedora22-1
+hostbase: twisted-fedora22-1
+public_ip: 209.132.184.183
+description: twisted buildbot for fedora 22
+
+cloud_networks:
+  # pythonbots-net
+  - net-id: "36ca66de-001d-4807-a688-58c363d84d68"
diff --git a/inventory/host_vars/twisted-fedora22-2.fedorainfracloud.org b/inventory/host_vars/twisted-fedora22-2.fedorainfracloud.org
new file mode 100644
index 0000000000..e4e318a7e7
--- /dev/null
+++ b/inventory/host_vars/twisted-fedora22-2.fedorainfracloud.org
@@ -0,0 +1,17 @@
+---
+image: "{{ fedora22_x86_64 }}"
+instance_type: m1.medium
+keypair: fedora-admin-20130801
+security_group: ssh-anywhere-pythonbots,icmp-anywhere-pythonbots,default
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: pythonbots
+inventory_instance_name: twisted-fedora22-1
+hostbase: twisted-fedora22-1
+public_ip: 209.132.184.184
+description: twisted buildbot for fedora 22
+
+cloud_networks:
+  # pythonbots-net
+  - net-id: "36ca66de-001d-4807-a688-58c363d84d68"
diff --git a/inventory/host_vars/twisted-rhel6-1.fedorainfracloud.org b/inventory/host_vars/twisted-rhel6-1.fedorainfracloud.org
new file mode 100644
index 0000000000..3ec25c6375
--- /dev/null
+++ b/inventory/host_vars/twisted-rhel6-1.fedorainfracloud.org
@@ -0,0 +1,17 @@
+---
+image: "{{ centos66_x86_64 }}"
+instance_type: m1.medium
+keypair: fedora-admin-20130801
+security_group: ssh-anywhere-pythonbots,icmp-anywhere-pythonbots,default
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: pythonbots
+inventory_instance_name: twisted-rhel6-1
+hostbase: twisted-rhel6-1
+public_ip: 209.132.184.185
+description: twisted buildbot for rhel 6
+
+cloud_networks:
+  # pythonbots-net
+  - net-id: "36ca66de-001d-4807-a688-58c363d84d68"
diff --git a/inventory/host_vars/twisted-rhel6-2.fedorainfracloud.org b/inventory/host_vars/twisted-rhel6-2.fedorainfracloud.org
new file mode 100644
index 0000000000..b70f326134
--- /dev/null
+++ b/inventory/host_vars/twisted-rhel6-2.fedorainfracloud.org
@@ -0,0 +1,17 @@
+---
+image: "{{ centos66_x86_64 }}"
+instance_type: m1.medium
+keypair: fedora-admin-20130801
+security_group: ssh-anywhere-pythonbots,icmp-anywhere-pythonbots,default
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: pythonbots
+inventory_instance_name: twisted-rhel6-2
+hostbase: twisted-rhel6-2
+public_ip: 209.132.184.186
+description: twisted buildbot for rhel6 2
+
+cloud_networks:
+  # pythonbots-net
+  - net-id: "36ca66de-001d-4807-a688-58c363d84d68"
diff --git a/inventory/host_vars/twisted-rhel7-1.fedorainfracloud.org b/inventory/host_vars/twisted-rhel7-1.fedorainfracloud.org
new file mode 100644
index 0000000000..93c87f219e
--- /dev/null
+++ b/inventory/host_vars/twisted-rhel7-1.fedorainfracloud.org
@@ -0,0 +1,17 @@
+---
+image: rhel7-20141015
+instance_type: m1.medium
+keypair: fedora-admin-20130801
+security_group: ssh-anywhere-pythonbots,icmp-anywhere-pythonbots,default
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: pythonbots
+inventory_instance_name: twisted-rhel7-1
+hostbase: twisted-rhel7-1
+public_ip: 209.132.184.187
+description: twisted buildbot for rhel7 1
+
+cloud_networks:
+  # pythonbots-net
+  - net-id: "36ca66de-001d-4807-a688-58c363d84d68"
diff --git a/inventory/host_vars/twisted-rhel7-2.fedorainfracloud.org b/inventory/host_vars/twisted-rhel7-2.fedorainfracloud.org
new file mode 100644
index 0000000000..41c24afb53
--- /dev/null
+++ b/inventory/host_vars/twisted-rhel7-2.fedorainfracloud.org
@@ -0,0 +1,17 @@
+---
+image: rhel7-20141015
+instance_type: m1.medium
+keypair: fedora-admin-20130801
+security_group: ssh-anywhere-pythonbots,icmp-anywhere-pythonbots,default
+zone: nova
+tcp_ports: [22, 80, 443]
+
+inventory_tenant: pythonbots
+inventory_instance_name: twisted-rhel7-2
+hostbase: twisted-rhel7-2
+public_ip: 209.132.184.188
+description: twisted buildbot for rhel7 2
+
+cloud_networks:
+  # pythonbots-net
+  - net-id: "36ca66de-001d-4807-a688-58c363d84d68"
diff --git a/playbooks/groups/twisted-buildbots.yml b/playbooks/groups/twisted-buildbots.yml
new file mode 100644
index 0000000000..7f00ef8132
--- /dev/null
+++ b/playbooks/groups/twisted-buildbots.yml
@@ -0,0 +1,36 @@
+- name: check/create instances
+  hosts: twisted-buildbots
+  gather_facts: False
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - /srv/private/ansible/vars.yml
+   - /srv/web/infra/ansible/vars/fedora-cloud.yml
+   - /srv/private/ansible/files/openstack/passwords.yml
+
+  tasks:
+  - include: "{{ tasks }}/persistent_cloud_new.yml"
+
+- name: setup all the things
+  hosts: twisted-buildbots
+  gather_facts: True
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - /srv/private/ansible/vars.yml
+   - /srv/private/ansible/files/openstack/passwords.yml
+   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  pre_tasks:
+  - include: "{{ tasks }}/cloud_setup_basic.yml"
+  - name: set hostname (required by some services, at least postfix need it)
+    shell: "hostname {{inventory_hostname}}"
+ 
+  tasks:
+
+  - name: add twisted key
+  authorized_key: user=root key="{{ item }}"
+  with_file:
+  - /srv/web/infra/ansible/files/twisted/ssh-pub-key
+  tags:
+  - config
+  - sshkeys