diff --git a/inventory/host_vars/qa12.qa.fedoraproject.org b/inventory/host_vars/qa12.qa.fedoraproject.org
index 3856ad1349..a007e654dd 100644
--- a/inventory/host_vars/qa12.qa.fedoraproject.org
+++ b/inventory/host_vars/qa12.qa.fedoraproject.org
@@ -7,20 +7,20 @@ nrpe_procs_crit: 1000
 eth0_ip: 10.5.131.20
 gw: 10.5.131.254
 
-short_hostname: qa12.qa
+short_hostname: qa12
 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" }
-  - { user: "{{ short_hostname }}-11", home: "/home/{{ short_hostname }}-11", dir: "/home/{{ short_hostname }}-11/slave" }
-  - { user: "{{ short_hostname }}-12", home: "/home/{{ short_hostname }}-12", dir: "/home/{{ short_hostname }}-12/slave" }
-  - { user: "{{ short_hostname }}-13", home: "/home/{{ short_hostname }}-13", dir: "/home/{{ short_hostname }}-13/slave" }
-  - { user: "{{ short_hostname }}-14", home: "/home/{{ short_hostname }}-14", dir: "/home/{{ short_hostname }}-14/slave" }
-  - { user: "{{ short_hostname }}-15", home: "/home/{{ short_hostname }}-15", dir: "/home/{{ short_hostname }}-15/slave" }
+  - { user: "{{ short_hostname }}-1", home: "/srv/buildslaves/{{ short_hostname }}-1", dir: "/srv/buildslaves/{{ short_hostname }}-1/slave" }
+  - { user: "{{ short_hostname }}-2", home: "/srv/buildslaves/{{ short_hostname }}-2", dir: "/srv/buildslaves/{{ short_hostname }}-2/slave" }
+  - { user: "{{ short_hostname }}-3", home: "/srv/buildslaves/{{ short_hostname }}-3", dir: "/srv/buildslaves/{{ short_hostname }}-3/slave" }
+  - { user: "{{ short_hostname }}-4", home: "/srv/buildslaves/{{ short_hostname }}-4", dir: "/srv/buildslaves/{{ short_hostname }}-4/slave" }
+  - { user: "{{ short_hostname }}-5", home: "/srv/buildslaves/{{ short_hostname }}-5", dir: "/srv/buildslaves/{{ short_hostname }}-5/slave" }
+  - { user: "{{ short_hostname }}-6", home: "/srv/buildslaves/{{ short_hostname }}-6", dir: "/srv/buildslaves/{{ short_hostname }}-6/slave" }
+  - { user: "{{ short_hostname }}-7", home: "/srv/buildslaves/{{ short_hostname }}-7", dir: "/srv/buildslaves/{{ short_hostname }}-7/slave" }
+  - { user: "{{ short_hostname }}-8", home: "/srv/buildslaves/{{ short_hostname }}-8", dir: "/srv/buildslaves/{{ short_hostname }}-8/slave" }
+  - { user: "{{ short_hostname }}-9", home: "/srv/buildslaves/{{ short_hostname }}-9", dir: "/srv/buildslaves/{{ short_hostname }}-9/slave" }
+  - { user: "{{ short_hostname }}-10", home: "/srv/buildslaves/{{ short_hostname }}-10", dir: "/srv/buildslaves/{{ short_hostname }}-10/slave" }
+  - { user: "{{ short_hostname }}-11", home: "/srv/buildslaves/{{ short_hostname }}-11", dir: "/srv/buildslaves/{{ short_hostname }}-11/slave" }
+  - { user: "{{ short_hostname }}-12", home: "/srv/buildslaves/{{ short_hostname }}-12", dir: "/srv/buildslaves/{{ short_hostname }}-12/slave" }
+  - { user: "{{ short_hostname }}-13", home: "/srv/buildslaves/{{ short_hostname }}-13", dir: "/srv/buildslaves/{{ short_hostname }}-13/slave" }
+  - { user: "{{ short_hostname }}-14", home: "/srv/buildslaves/{{ short_hostname }}-14", dir: "/srv/buildslaves/{{ short_hostname }}-14/slave" }
+  - { user: "{{ short_hostname }}-15", home: "/srv/buildslaves/{{ short_hostname }}-15", dir: "/srv/buildslaves/{{ short_hostname }}-15/slave" }
diff --git a/inventory/host_vars/qa13.qa.fedoraproject.org b/inventory/host_vars/qa13.qa.fedoraproject.org
index 0ae3319483..d01b8949cf 100644
--- a/inventory/host_vars/qa13.qa.fedoraproject.org
+++ b/inventory/host_vars/qa13.qa.fedoraproject.org
@@ -7,20 +7,20 @@ nrpe_procs_crit: 1000
 eth0_ip: 10.5.131.21
 gw: 10.5.131.254
 
-short_hostname: qa13.qa
+short_hostname: qa13
 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" }
-  - { user: "{{ short_hostname }}-11", home: "/home/{{ short_hostname }}-11", dir: "/home/{{ short_hostname }}-11/slave" }
-  - { user: "{{ short_hostname }}-12", home: "/home/{{ short_hostname }}-12", dir: "/home/{{ short_hostname }}-12/slave" }
-  - { user: "{{ short_hostname }}-13", home: "/home/{{ short_hostname }}-13", dir: "/home/{{ short_hostname }}-13/slave" }
-  - { user: "{{ short_hostname }}-14", home: "/home/{{ short_hostname }}-14", dir: "/home/{{ short_hostname }}-14/slave" }
-  - { user: "{{ short_hostname }}-15", home: "/home/{{ short_hostname }}-15", dir: "/home/{{ short_hostname }}-15/slave" }
+  - { user: "{{ short_hostname }}-1", home: "/srv/buildslaves/{{ short_hostname }}-1", dir: "/srv/buildslaves/{{ short_hostname }}-1/slave" }
+  - { user: "{{ short_hostname }}-2", home: "/srv/buildslaves/{{ short_hostname }}-2", dir: "/srv/buildslaves/{{ short_hostname }}-2/slave" }
+  - { user: "{{ short_hostname }}-3", home: "/srv/buildslaves/{{ short_hostname }}-3", dir: "/srv/buildslaves/{{ short_hostname }}-3/slave" }
+  - { user: "{{ short_hostname }}-4", home: "/srv/buildslaves/{{ short_hostname }}-4", dir: "/srv/buildslaves/{{ short_hostname }}-4/slave" }
+  - { user: "{{ short_hostname }}-5", home: "/srv/buildslaves/{{ short_hostname }}-5", dir: "/srv/buildslaves/{{ short_hostname }}-5/slave" }
+  - { user: "{{ short_hostname }}-6", home: "/srv/buildslaves/{{ short_hostname }}-6", dir: "/srv/buildslaves/{{ short_hostname }}-6/slave" }
+  - { user: "{{ short_hostname }}-7", home: "/srv/buildslaves/{{ short_hostname }}-7", dir: "/srv/buildslaves/{{ short_hostname }}-7/slave" }
+  - { user: "{{ short_hostname }}-8", home: "/srv/buildslaves/{{ short_hostname }}-8", dir: "/srv/buildslaves/{{ short_hostname }}-8/slave" }
+  - { user: "{{ short_hostname }}-9", home: "/srv/buildslaves/{{ short_hostname }}-9", dir: "/srv/buildslaves/{{ short_hostname }}-9/slave" }
+  - { user: "{{ short_hostname }}-10", home: "/srv/buildslaves/{{ short_hostname }}-10", dir: "/srv/buildslaves/{{ short_hostname }}-10/slave" }
+  - { user: "{{ short_hostname }}-11", home: "/srv/buildslaves/{{ short_hostname }}-11", dir: "/srv/buildslaves/{{ short_hostname }}-11/slave" }
+  - { user: "{{ short_hostname }}-12", home: "/srv/buildslaves/{{ short_hostname }}-12", dir: "/srv/buildslaves/{{ short_hostname }}-12/slave" }
+  - { user: "{{ short_hostname }}-13", home: "/srv/buildslaves/{{ short_hostname }}-13", dir: "/srv/buildslaves/{{ short_hostname }}-13/slave" }
+  - { user: "{{ short_hostname }}-14", home: "/srv/buildslaves/{{ short_hostname }}-14", dir: "/srv/buildslaves/{{ short_hostname }}-14/slave" }
+  - { user: "{{ short_hostname }}-15", home: "/srv/buildslaves/{{ short_hostname }}-15", dir: "/srv/buildslaves/{{ short_hostname }}-15/slave" }
diff --git a/inventory/host_vars/taskotron01.qa.fedoraproject.org b/inventory/host_vars/taskotron01.qa.fedoraproject.org
index 433bcd8dac..67cde31ea8 100644
--- a/inventory/host_vars/taskotron01.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron01.qa.fedoraproject.org
@@ -19,8 +19,8 @@ eth0_ip: 10.5.124.206
 # install
 ############################################################
 
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-25-taskotron-master
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/25/Server/x86_64/os/
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27-taskotron-master
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 vmhost: virthost-comm03.qa.fedoraproject.org
 volgroup: /dev/VirtGuests
@@ -44,65 +44,65 @@ public_hostname: taskotron.fedoraproject.org
 buildmaster: 10.5.124.206
 
 buildslaves:
-    - qa12.qa-1
-    - qa12.qa-2
-    - qa12.qa-3
-    - qa12.qa-4
-    - qa12.qa-5
-    - qa12.qa-6
-    - qa12.qa-7
-    - qa12.qa-8
-    - qa12.qa-9
-    - qa12.qa-10
-    - qa12.qa-11
-    - qa12.qa-12
-    - qa12.qa-13
-    - qa12.qa-14
-    - qa12.qa-15
-    - qa13.qa-1
-    - qa13.qa-2
-    - qa13.qa-3
-    - qa13.qa-4
-    - qa13.qa-5
-    - qa13.qa-6
-    - qa13.qa-7
-    - qa13.qa-8
-    - qa13.qa-9
-    - qa13.qa-10
-    - qa13.qa-11
-    - qa13.qa-12
-    - qa13.qa-13
-    - qa13.qa-14
-    - qa13.qa-15
+    - qa12-1
+    - qa12-2
+    - qa12-3
+    - qa12-4
+    - qa12-5
+    - qa12-6
+    - qa12-7
+    - qa12-8
+    - qa12-9
+    - qa12-10
+    - qa12-11
+    - qa12-12
+    - qa12-13
+    - qa12-14
+    - qa12-15
+    - qa13-1
+    - qa13-2
+    - qa13-3
+    - qa13-4
+    - qa13-5
+    - qa13-6
+    - qa13-7
+    - qa13-8
+    - qa13-9
+    - qa13-10
+    - qa13-11
+    - qa13-12
+    - qa13-13
+    - qa13-14
+    - qa13-15
 i386_buildslaves:
-    - qa13.qa-10
+    - qa13-10
 x86_64_buildslaves:
-    - qa12.qa-1
-    - qa12.qa-2
-    - qa12.qa-3
-    - qa12.qa-4
-    - qa12.qa-5
-    - qa12.qa-6
-    - qa12.qa-7
-    - qa12.qa-8
-    - qa12.qa-9
-    - qa12.qa-10
-    - qa12.qa-11
-    - qa12.qa-12
-    - qa12.qa-13
-    - qa12.qa-14
-    - qa12.qa-15
-    - qa13.qa-1
-    - qa13.qa-2
-    - qa13.qa-3
-    - qa13.qa-4
-    - qa13.qa-5
-    - qa13.qa-6
-    - qa13.qa-7
-    - qa13.qa-8
-    - qa13.qa-9
-    - qa13.qa-11
-    - qa13.qa-12
-    - qa13.qa-13
-    - qa13.qa-14
-    - qa13.qa-15
+    - qa12-1
+    - qa12-2
+    - qa12-3
+    - qa12-4
+    - qa12-5
+    - qa12-6
+    - qa12-7
+    - qa12-8
+    - qa12-9
+    - qa12-10
+    - qa12-11
+    - qa12-12
+    - qa12-13
+    - qa12-14
+    - qa12-15
+    - qa13-1
+    - qa13-2
+    - qa13-3
+    - qa13-4
+    - qa13-5
+    - qa13-6
+    - qa13-7
+    - qa13-8
+    - qa13-9
+    - qa13-11
+    - qa13-12
+    - qa13-13
+    - qa13-14
+    - qa13-15
diff --git a/roles/taskotron/buildslave-configure/tasks/main.yml b/roles/taskotron/buildslave-configure/tasks/main.yml
index cc82e59357..a31d00fc49 100644
--- a/roles/taskotron/buildslave-configure/tasks/main.yml
+++ b/roles/taskotron/buildslave-configure/tasks/main.yml
@@ -110,7 +110,7 @@
   file: path={{ item.home }}/slave setype=var_lib_t owner={{ item.user }} group={{ slaves_group }} mode=0700 state=directory
   with_items:
     - '{{ slaves|default([dict(user="", home="", dir="")]) }}'
-  when: deployment_type in ['dev', 'stg']
+  when: deployment_type in ['dev', 'stg', 'prod']
 
 - name: generate buildslave service file
   template: src=buildslave@.service.j2 dest=/lib/systemd/system/buildslave@.service owner=root group=root mode=0644
diff --git a/roles/taskotron/buildslave/tasks/main.yml b/roles/taskotron/buildslave/tasks/main.yml
index 45e8174ea9..57baa7e191 100644
--- a/roles/taskotron/buildslave/tasks/main.yml
+++ b/roles/taskotron/buildslave/tasks/main.yml
@@ -60,7 +60,7 @@
 - name: set the selinux fcontext type for the buildslave dir to var_lib_t
   command: semanage fcontext -a -t var_lib_t "{{ item.dir }}"
   with_items: "{{ slaves }}"
-  when: slaves is defined and deployment_type in ['prod', 'qa-prod', 'qa-stg']
+  when: slaves is defined and deployment_type in ['qa-prod', 'qa-stg']
 
 - name: make sure the selinux fcontext is restored
   command: restorecon -R "{{ item.dir }}"