diff --git a/roles/taskotron/buildslave-configure/templates/buildslave@.service.j2 b/roles/taskotron/buildslave-configure/templates/buildslave@.service.j2
index 6c63f14b2b..a66b743384 100644
--- a/roles/taskotron/buildslave-configure/templates/buildslave@.service.j2
+++ b/roles/taskotron/buildslave-configure/templates/buildslave@.service.j2
@@ -4,18 +4,10 @@ After=network.target
 
 [Service]
 Type=forking
-{% if deployment_type in ['prod'] %}
 # disabled because of https://pagure.io/taskotron/issue/236
 #PIDFile=/home/%i/slave/twistd.pid
-ExecStart=/bin/buildslave start /home/%i/slave/
-ExecStop=/bin/buildslave stop /home/%i/slave/
-{% endif %}
-{% if deployment_type in ['dev', 'stg'] %}
-# disabled because of https://pagure.io/taskotron/issue/236
-#PIDFile=/srv/buildslaves/%i/slave/twistd.pid
 ExecStart=/bin/buildslave start /srv/buildslaves/%i/slave/
 ExecStop=/bin/buildslave stop /srv/buildslaves/%i/slave/
-{% endif %}
 User=%i
 Group={{ slaves_group }}