diff --git a/roles/mote/templates/category_mappings.json b/roles/mote/templates/category_mappings.json
index 40afc134cd..bae86baf8f 100644
--- a/roles/mote/templates/category_mappings.json
+++ b/roles/mote/templates/category_mappings.json
@@ -1,14 +1,15 @@
 {
+    "Project Leadership": ["board"],
+    "Engineering Leadership": ["fesco"],
     "Ambassadors": ["famna", "#fedora-ambassadors"],
     "Infrastructure": ["infrastructure", "#fedora-apps", "#fedora-admin"],
-    "Design": [],
-    "Documentation": [],
-    "Epel": [],
-    "Internationalization": [],
-    "Localization": [],
-    "Marketing": [],
-    "Magazine": [],
-    "Packaging": [],
-    "Quality Assurance": [],
-    "Websites": []
+    "Design": ["fedora-design"],
+    "Documentation": ["fedora-docs"],
+    "Epel": ["epel"],
+    "Internationalization": ["i18n"],
+    "Marketing": ["fedora-mktg"],
+    "Packaging": ["fpc"],
+    "Quality Assurance": ["fedora-qa"],
+    "Websites": ["fedora-websites"],
+    "Release Engineering": ["releng"]
 }
diff --git a/roles/mote/templates/name_mappings.json b/roles/mote/templates/name_mappings.json
index a686ef81f8..f90cd1750a 100644
--- a/roles/mote/templates/name_mappings.json
+++ b/roles/mote/templates/name_mappings.json
@@ -1,10 +1,54 @@
 {
     "famna": {
         "friendly-name": "Fedora North American Ambassadors",
-        "aliases": [""]
+        "aliases": []
     },
     "infrastructure": {
         "friendly-name": "Fedora Infrastructure Team",
         "aliases": ["fedora-infrastructure", "fedora_infrastructure", "#fedora-apps", "#fedora-admin"]
+    },
+    "fedora-design": {
+        "friendly-name": "Fedora Design Team",
+        "aliases": ["fedora-design", "designteam", "#fedora-design"]
+    },
+    "epel": {
+        "friendly-name": "EPEL",
+        "aliases": []
+    },
+    "fedora-mktg": {
+        "friendly-name": "Fedora Marketing",
+        "aliases": []
+    },
+    "fedora-docs": {
+        "friendly-name": "Fedora Docs Team",
+        "aliases": []
+    },
+    "i18n": {
+        "friendly-name": "Fedora i18n Team",
+        "aliases": []
+    },
+    "fpc": {
+        "friendly-name": "Fedora Packaging Committee (FPC)",
+        "aliases": []
+    },
+    "fedora-qa": {
+        "friendly-name": "Fedora QA",
+        "aliases": []
+    },
+    "fedora-websites": {
+        "friendly-name": "Fedora Websites Team",
+        "aliases": []
+    },
+    "releng": {
+        "friendly-name": "Fedora Release Engineering (releng)",
+        "aliases": []
+    },
+    "fesco": {
+        "friendly-name": "Fedora Engineering Steering Committee (FESCo)",
+        "aliases": []
+    },
+    "board": {
+        "friendly-name": "The Board",
+        "aliases": []
     }
 }