diff --git a/handbook/company/development-groups.md b/handbook/company/development-groups.md
index 96c60e2008..7a865fedf3 100644
--- a/handbook/company/development-groups.md
+++ b/handbook/company/development-groups.md
@@ -26,11 +26,11 @@ The goal of the MDM group is to reach [product maturity](https://drive.google.co
| Responsibility | Human(s) |
|:----------------------------------|:--------------------------|
-| Designer | Noah Talerman
+| Designer | Marko Lisica
+| Engineering manager | George Karr
| Quality assurance | Reed Haynes
| Product manager | Noah Talerman
-| Engineering manager | Luke Heath
-| Software engineers (developers) | Gabe Hernandez, Jacob Shandling, Martin Angers*, Roberto Dip, Sarah Gillespie
+| Software engineers (developers) | Gabe Hernandez, Marcos Oviedo _(Windows specialty)_, Martin Angers*, Roberto Dip, Sarah Gillespie
> The Slack channel, kanban release board, and label for this product group is `#g-mdm`.
@@ -42,11 +42,11 @@ The goal of the customer experience (CX) group is to make customers happier and
| Responsibility | Human(s) |
|:----------------------------------|:--------------------------|
-| Designer | Mike Thomas
+| Designer | Rachael Shaw
+| Engineering manager | Sharon Katz
| Quality assurance | Reed Haynes
| Product manager | Zay Hanlon
-| Engineering manager | Sharon Katz
-| Software engineers (developers) | Artemis Tosini, Lucas Rodriguez, Marcos Oviedo, Rachel Perkins,Juan Fernandez*
Eric Shaw _(fleetdm.com specialty)_
Robert Fairburn, Zach Winnerman _(infrastructure specialty)_
+| Software engineers (developers) | Artemis Tosini, Eric Shaw _(fleetdm.com specialty)_, Jacob Shandling, Juan Fernandez*, Lucas Rodriguez, Rachel Perkins, Robert Fairburn _(infrastructure specialty)_, Zach Winnerman _(infrastructure specialty)_
> The Slack channel, kanban release board, and label for this product group is `#g-customer-experience`.