diff --git a/buildbot/master/init.sls b/buildbot/master/init.sls
index 818fdf30..dd3323c6 100644
--- a/buildbot/master/init.sls
+++ b/buildbot/master/init.sls
@@ -11,7 +11,7 @@ buildbot-master:
       - txgithub == 15.0.0
       - boto == 2.38.0
       - pyyaml == 3.11
-      - twisted == 16.6.0
+      - twisted == 16.6.0  # NOTE: keep in sync with buildbot-slave sls
     - require:
       - pkg: pip
   service.running:
@@ -19,12 +19,14 @@ buildbot-master:
     # Buildbot must be restarted manually! See 'Buildbot administration' on the
     # wiki and https://github.com/servo/saltfs/issues/304.
     - require:
+      - user: servo
       - pip: buildbot-master
-      - file: {{ common.servo_home }}/buildbot/master
+      - file: ownership-{{ common.servo_home }}/buildbot/master
       - file: /etc/init/buildbot-master.conf
 
-{{ common.servo_home }}/buildbot/master:
+deploy-{{ common.servo_home }}/buildbot/master:
   file.recurse:
+    - name: {{ common.servo_home }}/buildbot/master
     - source: salt://{{ tpldir }}/files/config
     - user: servo
     - group: servo
@@ -34,6 +36,8 @@ buildbot-master:
     - context:
         common: {{ common }}
         buildbot_credentials: {{ pillar['buildbot']['credentials'] }}
+    - require:
+      - user: servo
 
 ownership-{{ common.servo_home }}/buildbot/master:
   file.directory:
@@ -43,6 +47,8 @@ ownership-{{ common.servo_home }}/buildbot/master:
     - recurse:
       - user
       - group
+    - require:
+      - file: deploy-{{ common.servo_home }}/buildbot/master
 
 /etc/init/buildbot-master.conf:
   file.managed:
diff --git a/buildbot/slave/init.sls b/buildbot/slave/init.sls
index 2263d6d9..090e1e06 100644
--- a/buildbot/slave/init.sls
+++ b/buildbot/slave/init.sls
@@ -7,6 +7,7 @@ buildbot-slave-dependencies:
   pip.installed:
     - pkgs:
       - buildbot-slave == 0.8.12
+      - twisted == 16.6.0 # NOTE: keep in sync with buildbot-master sls
     - require:
       - pkg: pip
 
@@ -24,6 +25,8 @@ buildbot-slave-dependencies:
     - template: jinja
     - context:
         common: {{ common }}
+    - require:
+      - user: servo
 
 {% if grains['kernel'] == 'Darwin' %}
 
@@ -55,5 +58,8 @@ buildbot-slave-dependencies:
 buildbot-slave:
   service.running:
     - enable: True
+    - require:
+      - user: servo
     - watch:
+      - pip: buildbot-slave-dependencies
       - file: {{ common.servo_home }}/buildbot/slave