diff --git a/index.bs b/index.bs
index 70bd548..257e6cc 100644
--- a/index.bs
+++ b/index.bs
@@ -5,8 +5,9 @@ Level: 1
 Status: CG-Draft
 Group: WICG
 URL: https://wicg.github.io/client-hints-infrastructure
-Editor: Yoav Weiss, Shopify, yoav@yoav.ws, https://blog.yoav.ws
+Editor: Mike Taylor, w3cid 90704, Google https://google.org, miketaylr@google.com
 Editor: Ari Chivukula, w3cid 132484, Google https://google.org, arichiv@google.com
+Former Editor: Yoav Weiss, w3cid 58673, Shopify https://www.shopify.com, yoav@yoav.ws, https://blog.yoav.ws
 Abstract: Specification of the Client Hints infrastructure and its integration with Fetch and HTML
 Markup Shorthands: markdown yes
 Repository: WICG/client-hints-infrastructure
diff --git a/w3c.json b/w3c.json
index ddb742b..b1dfb55 100644
--- a/w3c.json
+++ b/w3c.json
@@ -1,5 +1,5 @@
  {
     "group":      [80485]
-,   "contacts":   ["yoavweiss"]
+,   "contacts":   ["miketaylr", "arichiv"]
 ,   "repo-type":  "cg-report"
 }