diff --git a/roles/taskotron/buildslave-configure/tasks/main.yml b/roles/taskotron/buildslave-configure/tasks/main.yml
index f3b81f1d77..5a61a13150 100644
--- a/roles/taskotron/buildslave-configure/tasks/main.yml
+++ b/roles/taskotron/buildslave-configure/tasks/main.yml
@@ -106,7 +106,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']
+  when: deployment_type in ['dev', 'stg']
 
 - 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 957d6e78fa..45e8174ea9 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 ['stg', 'prod', 'qa-prod', 'qa-stg']
+  when: slaves is defined and deployment_type in ['prod', 'qa-prod', 'qa-stg']
 
 - name: make sure the selinux fcontext is restored
   command: restorecon -R "{{ item.dir }}"