diff --git a/inventory/host_vars/qa10.qa.fedoraproject.org b/inventory/host_vars/qa10.qa.fedoraproject.org
index 0538d9696f..ea9f67314c 100644
--- a/inventory/host_vars/qa10.qa.fedoraproject.org
+++ b/inventory/host_vars/qa10.qa.fedoraproject.org
@@ -4,3 +4,16 @@ fas_client_groups: sysadmin-qa,sysadmin-main
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 nrpe_procs_warn: 900
 nrpe_procs_crit: 1000
+
+short_hostname: qa10.qa
+slaves:
+  - { user: "{{ short_hostname }}-1", home: "/home/{{ short_hostname }}-1", dir: "/home/{{ short_hostname }}-1/slave" }
+  - { user: "{{ short_hostname }}-2", home: "/home/{{ short_hostname }}-2", dir: "/home/{{ short_hostname }}-2/slave" }
+  - { user: "{{ short_hostname }}-3", home: "/home/{{ short_hostname }}-3", dir: "/home/{{ short_hostname }}-3/slave" }
+  - { user: "{{ short_hostname }}-4", home: "/home/{{ short_hostname }}-4", dir: "/home/{{ short_hostname }}-4/slave" }
+  - { user: "{{ short_hostname }}-5", home: "/home/{{ short_hostname }}-5", dir: "/home/{{ short_hostname }}-5/slave" }
+  - { user: "{{ short_hostname }}-6", home: "/home/{{ short_hostname }}-6", dir: "/home/{{ short_hostname }}-6/slave" }
+  - { user: "{{ short_hostname }}-7", home: "/home/{{ short_hostname }}-7", dir: "/home/{{ short_hostname }}-7/slave" }
+  - { user: "{{ short_hostname }}-8", home: "/home/{{ short_hostname }}-8", dir: "/home/{{ short_hostname }}-8/slave" }
+  - { user: "{{ short_hostname }}-9", home: "/home/{{ short_hostname }}-9", dir: "/home/{{ short_hostname }}-9/slave" }
+  - { user: "{{ short_hostname }}-10", home: "/home/{{ short_hostname }}-10", dir: "/home/{{ short_hostname }}-10/slave" }
diff --git a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org
index 5bc975e63c..2039198973 100644
--- a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org
+++ b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org
@@ -13,13 +13,21 @@ eth0_ip: 10.5.124.147
 # install
 ############################################################
 
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/
 
 volgroup: /dev/vg_guests
 vmhost: virthost-comm04.qa.fedoraproject.org
 datacenter: phx2
 
+virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
+                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
+                 "ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }}
+                  gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
+                  hostname={{ inventory_hostname }}"
+                 --network=bridge=br0 --autostart --noautoconsole
+
 
 ############################################################
 # virtual machine
@@ -33,12 +41,3 @@ num_cpus: 4
 
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
-
-virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
-                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
-                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
-                 "ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }}
-                  gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
-                  hostname={{ inventory_hostname }}"
-                 --network=bridge=br0 --autostart --noautoconsole
-
diff --git a/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org b/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org
index 804e2a3d48..ca36bc3496 100644
--- a/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org
@@ -13,11 +13,12 @@ eth0_ip: 10.5.124.232
 # install
 ############################################################
 
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22-taskotron-master
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23-taskotron-master
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/
 volgroup: /dev/vg_guests
 vmhost: virthost-comm04.qa.fedoraproject.org
 datacenter: phx2
+
 fas_client_groups: sysadmin-qa,sysadmin-main
 
 
@@ -25,7 +26,7 @@ fas_client_groups: sysadmin-qa,sysadmin-main
 # virtual machine
 ############################################################
 
-lvm_size: 45000
+lvm_size: 55000
 mem_size: 4096
 num_cpus: 4
 
@@ -49,19 +50,25 @@ public_hostname: taskotron.stg.fedoraproject.org
 buildmaster: 10.5.124.232
 
 buildslaves:
-    - taskotron-client11
-    - taskotron-client12
-    - taskotron-client13
-    - taskotron-client14
-    - taskotron-client19
-    - taskotron-client20
-    - taskotron-client21
+    - qa10.qa-1
+    - qa10.qa-2
+    - qa10.qa-3
+    - qa10.qa-4
+    - qa10.qa-5
+    - qa10.qa-6
+    - qa10.qa-7
+    - qa10.qa-8
+    - qa10.qa-9
+    - qa10.qa-10
 i386_buildslaves:
-    - taskotron-client12
-    - taskotron-client19
+    - qa10.qa-10
 x86_64_buildslaves:
-    - taskotron-client11
-    - taskotron-client13
-    - taskotron-client14
-    - taskotron-client20
-    - taskotron-client21
+    - qa10.qa-1
+    - qa10.qa-2
+    - qa10.qa-3
+    - qa10.qa-4
+    - qa10.qa-5
+    - qa10.qa-6
+    - qa10.qa-7
+    - qa10.qa-8
+    - qa10.qa-9