diff --git a/etc/taskcluster/README.md b/etc/taskcluster/README.md
index 3c8bb4bfe81..958aeff50e3 100644
--- a/etc/taskcluster/README.md
+++ b/etc/taskcluster/README.md
@@ -193,8 +193,7 @@ daily tasks are indexed under the [`project.servo.servo.daily`] namespace.
 
 ## AWS EC2 workers
 
-As of this writing, Servo on Taskcluster can only use the `servo-docker-worker` worker type.
-Tasks scheduled with this worker type run in a Linux environment,
+Tasks scheduled with the `servo-docker-worker` worker type run in a Linux environment,
 in a Docker container, on an AWS EC2 virtual machine.
 
 These machines are short-lived “spot instances”.
@@ -213,6 +212,15 @@ in particular with the types of EC2 instances to be used.
 [worker type definition]: https://tools.taskcluster.net/aws-provisioner/servo-docker-worker/view
 
 
+## Other worker types
+
+See respective `README.md` files for:
+
+* [Windows](windows/README.md), also short-lived workers on EC2
+* [macOS](macos/README.md), Mac Minis hosted by Macstadium
+* [Non-virtualized Linux](packet.net/README.md), hosted by Packet.net
+
+
 ## Self-service, Bugzilla, and IRC
 
 Taskcluster is designed to be “self-service” as much as possible,
diff --git a/etc/taskcluster/macos/README.md b/etc/taskcluster/macos/README.md
index 287d1010f1e..194c721ca39 100644
--- a/etc/taskcluster/macos/README.md
+++ b/etc/taskcluster/macos/README.md
@@ -15,6 +15,18 @@ cd etc/taskcluster/macos
 ./salt-ssh '*' state.apply test=True
 ```
 
+## Troubleshooting
+
+SSH into `servo-tc-mac1.servo.org`.
+`generic-worker` logs are in `less /Users/worker/stderr.log`.
+
+If the worker seems stuck but nothing seems wrong in the log,
+try running `launchctl stop net.generic.worker`.
+(It is configured to restart automatically.)
+This issue is tracked at
+[generic-worker#133](https://github.com/taskcluster/generic-worker/issues/133).
+
+
 ## (Re)deploying a server
 
 * Place an order or file a ticket with MacStadium to get a new hardware or reinstall an OS.
diff --git a/etc/taskcluster/windows/README.md b/etc/taskcluster/windows/README.md
index 705bf1189aa..ed362f3a443 100644
--- a/etc/taskcluster/windows/README.md
+++ b/etc/taskcluster/windows/README.md
@@ -1,4 +1,8 @@
-# Windows AMIs for Servo on Taskcluster
+# Windows workers for Servo on Taskcluster
+
+The `servo-win2016` worker type runs short-lived Windows 2016 workers on EC2.
+
+## AMIs
 
 Unlike Linux tasks on `docker-worker` where each tasks is executed in a container
 based on a Docker image provided with the task,