diff --git a/global_config.ini b/global_config.ini
index 9a51c19..f2b41f0 100644
--- a/global_config.ini
+++ b/global_config.ini
@@ -71,6 +71,7 @@
 smtp_password:
 # Time in hours to wait before giving up on crash collection.
 crash_collection_hours_to_wait: 0.001
+sam_instances: cautotest, cautotest-cq
 
 [SCHEDULER]
 die_on_orphans: False
@@ -154,7 +155,12 @@
 dns_zone: cros.corp.google.com
 source_tree: /usr/local/google/chromeos
 image_storage_server: gs://chromeos-image-archive/
-# chromeos-devserver{1,3,4,5}.cros
+# dev_server_hosts is the list of all servers running a devserver instance
+# (regardless of CrashServer/ImageServer/etc.) that should be considered for
+# monitoring/deploy actions.  You should very likely keep this list in sync with
+# `dev_server` and `crash_server` unless you're very temporarily pulling a
+# server out of rotation.
+dev_server_hosts: chromeos-devserver1, chromeos-devserver2, chromeos-devserver3, chromeos-devserver4, chromeos-devserver5, chromeos-crash1
 dev_server: http://172.22.50.205:8082,http://172.22.50.2:8082,http://172.17.40.27:8082,http://172.17.40.28:8082,http://172.17.40.17:8082
 canary_channel_server: gs://chromeos-releases/canary-channel/
 # chromeos-crash1.cros