diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 3c28ea53208..b07ae54b023 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -228,7 +228,7 @@ def macos_unit():
         macos_build_task("Dev build + unit tests")
         .with_treeherder("macOS x64", "Unit")
         .with_script("""
-            ./mach build --dev
+            ./mach build --dev --verbose
             ./mach test-unit
             ./mach package --dev
             ./etc/ci/lockfile_changed.sh
@@ -264,7 +264,7 @@ def android_arm32_dev_from_macos():
             export HOST_CC="$(brew --prefix llvm)/bin/clang"
             export HOST_CXX="$(brew --prefix llvm)/bin/clang++"
             ./mach bootstrap-android --accept-all-licences --build
-            ./mach build --android --dev
+            ./mach build --android --dev --verbose
         """)
         .find_or_create("android_arm32_dev.macos." + CONFIG.git_sha)
     )
@@ -509,7 +509,7 @@ def macos_wpt():
         macos_build_task("Release build")
         .with_treeherder("macOS x64", "Release")
         .with_script("""
-            ./mach build --release
+            ./mach build --release --verbose
             ./etc/ci/lockfile_changed.sh
             tar -czf target.tar.gz \
                 target/release/servo \
diff --git a/etc/taskcluster/macos/states/generic-worker.sls b/etc/taskcluster/macos/states/generic-worker.sls
index 0c3db51254f..007a28665cd 100644
--- a/etc/taskcluster/macos/states/generic-worker.sls
+++ b/etc/taskcluster/macos/states/generic-worker.sls
@@ -13,6 +13,8 @@ GMT:
     - source_hash: sha256=817e72972a7c077f1a829d5824e5c0e831eb6f9b254672e7427246a8dd476a59
     - mode: 755
     - makedirs: True
+    - watch_in:
+      - service: net.generic.worker
 
 {{ bin }}/livelog:
   file.managed:
@@ -20,6 +22,8 @@ GMT:
     - source_hash: sha256=be5d4b998b208afd802ac6ce6c4d4bbf0fb3816bb039a300626abbc999dfe163
     - mode: 755
     - makedirs: True
+    - watch_in:
+      - service: net.generic.worker
 
 {{ bin }}/taskcluster-proxy:
   file.managed:
@@ -27,6 +31,8 @@ GMT:
     - source_hash: sha256=3faf524b9c6b9611339510797bf1013d4274e9f03e7c4bd47e9ab5ec8813d3ae
     - mode: 755
     - makedirs: True
+    - watch_in:
+      - service: net.generic.worker
 
 {{ user }} group:
   group.present:
@@ -74,7 +80,11 @@ GMT:
     - runas: {{ user }}
 
 /Library/LaunchAgents/net.generic.worker.plist:
+  file.absent: []
+
+net.generic.worker:
   file.managed:
+    - name: /Library/LaunchDaemons/net.generic.worker.plist
     - mode: 600
     - user: root
     - template: jinja
@@ -84,7 +94,7 @@ GMT:
       etc: {{ etc }}
       home: {{ home }}
       username: {{ user }}
-
-net.generic.worker:
   service.running:
     - enable: True
+    - watch:
+      - file: /Library/LaunchDaemons/net.generic.worker.plist