diff --git a/data/custom_fields.json b/data/custom_fields.json
index 9cccf4c..127173f 100644
--- a/data/custom_fields.json
+++ b/data/custom_fields.json
@@ -1 +1 @@
-{"custom_fields":[{"id":2,"name":"Discord ID","description":"ID used to link user to their discord account, to enable integration","customized_type":"user","field_format":"string","regexp":"","min_length":null,"max_length":null,"is_required":false,"is_filter":false,"searchable":false,"multiple":false,"default_value":"","visible":true},{"id":4,"name":"syncdata","description":"Metadata used to sync the ticket with external sources.\r\n\r\nCurrent format is thread-id|zulu-timestamp.\r\n\r\nNot recommend to edit.","customized_type":"issue","field_format":"string","regexp":"","min_length":null,"max_length":null,"is_required":false,"is_filter":true,"searchable":false,"multiple":false,"default_value":"","visible":false,"trackers":[{"id":2,"name":"Infra-Field"},{"id":4,"name":"Software-Dev"},{"id":6,"name":"Infra-Config"},{"id":8,"name":"External-Comms-Intake"},{"id":9,"name":"Comms"},{"id":10,"name":"Admin"},{"id":17,"name":"Research"}],"roles":[{"id":3,"name":"Administrator"}]},{"id":5,"name":"To/CC","description":"Contains the To and Cc headers from the email that created the ticket.","customized_type":"issue","field_format":"string","regexp":"","min_length":null,"max_length":null,"is_required":false,"is_filter":false,"searchable":true,"multiple":false,"default_value":"","visible":true,"trackers":[{"id":2,"name":"Infra-Field"},{"id":4,"name":"Software-Dev"},{"id":6,"name":"Infra-Config"},{"id":8,"name":"External-Comms-Intake"},{"id":9,"name":"Comms"},{"id":10,"name":"Admin"},{"id":13,"name":"Test-Reject"},{"id":17,"name":"Research"}],"roles":[]}]}
\ No newline at end of file
+{"custom_fields":[{"id":2,"name":"Discord ID","description":"ID used to link user to their discord account, to enable integration","customized_type":"user","field_format":"string","regexp":"","min_length":null,"max_length":null,"is_required":false,"is_filter":false,"searchable":false,"multiple":false,"default_value":"","visible":true},{"id":4,"name":"syncdata","description":"Metadata used to sync the ticket with external sources.\r\n\r\nCurrent format is thread-id|zulu-timestamp.\r\n\r\nNot recommend to edit.","customized_type":"issue","field_format":"string","regexp":"","min_length":null,"max_length":null,"is_required":false,"is_filter":true,"searchable":false,"multiple":false,"default_value":"","visible":false,"trackers":[{"id":2,"name":"Infra-Field"},{"id":4,"name":"Software-Dev"},{"id":6,"name":"Infra-Config"},{"id":8,"name":"External-Comms-Intake"},{"id":9,"name":"Outreach-Partnerships"},{"id":10,"name":"Admin"},{"id":17,"name":"Research"},{"id":18,"name":"Mutual-Aid-Action"},{"id":19,"name":"SCN-Space"}],"roles":[{"id":3,"name":"Administrator"}]},{"id":5,"name":"To/CC","description":"Contains the To and Cc headers from the email that created the ticket.","customized_type":"issue","field_format":"string","regexp":"","min_length":null,"max_length":null,"is_required":false,"is_filter":false,"searchable":true,"multiple":false,"default_value":"","visible":true,"trackers":[{"id":2,"name":"Infra-Field"},{"id":4,"name":"Software-Dev"},{"id":6,"name":"Infra-Config"},{"id":8,"name":"External-Comms-Intake"},{"id":9,"name":"Outreach-Partnerships"},{"id":10,"name":"Admin"},{"id":13,"name":"Test-Reject"},{"id":17,"name":"Research"},{"id":18,"name":"Mutual-Aid-Action"},{"id":19,"name":"SCN-Space"}],"roles":[]}]}
diff --git a/data/groups.json b/data/groups.json
index be68f93..a1f1a85 100644
--- a/data/groups.json
+++ b/data/groups.json
@@ -8,10 +8,6 @@
         "id": 661,
         "name": "blocked"
       },
-      {
-        "id": 34,
-        "name": "comms-team"
-      },
       {
         "id": 650,
         "name": "infra-config-team"
@@ -24,13 +20,25 @@
         "id": 2279,
         "name": "intake-team"
       },
+      {
+        "id": 916,
+        "name": "mutual-aid-team"
+      },
+      {
+        "id": 34,
+        "name": "outreach-team"
+      },
+      {
+        "id": 917,
+        "name": "scn-space-member"
+      },
       {
         "id": 30,
         "name": "software-dev-team"
       },
       {
         "id": 2280,
-        "name": "uw-research-nsf-team"
+        "name": "uw-research-team"
       }
     ]
-  }
\ No newline at end of file
+}
diff --git a/data/groups/2280.json b/data/groups/2280.json
index 3da4d36..777764c 100644
--- a/data/groups/2280.json
+++ b/data/groups/2280.json
@@ -1,6 +1,6 @@
 {
     "group": {
       "id": 2280,
-      "name": "uw-research-nsf-team"
+      "name": "uw-research-team"
     }
-}
\ No newline at end of file
+}
diff --git a/data/groups/34.json b/data/groups/34.json
index 9f96ab3..c1761d1 100644
--- a/data/groups/34.json
+++ b/data/groups/34.json
@@ -1,6 +1,6 @@
 {
     "group": {
         "id": 34,
-        "name": "comms-team"
+        "name": "outreach-team"
     }
-}
\ No newline at end of file
+}
diff --git a/data/groups/916.json b/data/groups/916.json
new file mode 100644
index 0000000..c10b273
--- /dev/null
+++ b/data/groups/916.json
@@ -0,0 +1,6 @@
+{
+    "group": {
+      "id": 916,
+      "name": "mutual-aid-team"
+    }
+}
diff --git a/data/groups/917.json b/data/groups/917.json
new file mode 100644
index 0000000..2ae03f3
--- /dev/null
+++ b/data/groups/917.json
@@ -0,0 +1,6 @@
+{
+    "group": {
+      "id": 916,
+      "name": "scn-space-member"
+    }
+}
diff --git a/data/issues/595.json b/data/issues/595.json
index 294905e..a6ae1fd 100644
--- a/data/issues/595.json
+++ b/data/issues/595.json
@@ -31,7 +31,7 @@
             "name": "feature request"
         },
         "subject": "Improved collaboration alerts for Redmine",
-        "description": "Owner = Assigned\r\nCollaborators = \"Watchers\" for Discord? (can turn off email- user setting)\r\nDue date, after which you have to give up the task by default (max 1 month)\r\nYour list is public\r\nEncourage people to carve out sub tickets\r\nOnly one owner and you can add yourself as Watcher \r\nCan you at mention watchers in a thread?\r\nYou can co own by creating a group\r\n\r\nAsks:\r\n* Command: \"Alert\" on a ticket/thread: if you're in a thread, it will know what ticket to alert on\r\n* Command: \"add yourself as a watcher\" for a ticket via Discord\r\n* Addition to \"new\" command- attach to a current ticket (as a sub ticket?)- this becomes a new thread\r\n* Unassign tickets that have not been touched for a certain amount of time eg 4 weeks- back to ticket intake, status back to new, send an alert to collaborators\r\n* Tracker to Discord channel mapping:\r\n- External Comms Intake- admin-team\r\n- Admin- admin-team\r\n- Comms- outreach\r\n- Infra-config- routing and infrastructure\r\n- Infra-field- installs\r\n- Software-dev- network software\r\n- Research- uw research nsf",
+        "description": "Owner = Assigned\r\nCollaborators = \"Watchers\" for Discord? (can turn off email- user setting)\r\nDue date, after which you have to give up the task by default (max 1 month)\r\nYour list is public\r\nEncourage people to carve out sub tickets\r\nOnly one owner and you can add yourself as Watcher \r\nCan you at mention watchers in a thread?\r\nYou can co own by creating a group\r\n\r\nAsks:\r\n* Command: \"Alert\" on a ticket/thread: if you're in a thread, it will know what ticket to alert on\r\n* Command: \"add yourself as a watcher\" for a ticket via Discord\r\n* Addition to \"new\" command- attach to a current ticket (as a sub ticket?)- this becomes a new thread\r\n* Unassign tickets that have not been touched for a certain amount of time eg 4 weeks- back to ticket intake, status back to new, send an alert to collaborators\r\n* Tracker to Discord channel mapping:\r\n- External Comms Intake- admin-team\r\n- Admin- admin-team\r\n- Outreach-Partnerships- outreach\r\n- Infra-config- routing and infrastructure\r\n- Infra-field- installs\r\n- Software-dev- network software\r\n- Research- uw research nsf",
         "start_date": "2024-03-21",
         "due_date": null,
         "done_ratio": 75,
@@ -122,4 +122,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/data/trackers.json b/data/trackers.json
index 1e83c92..382c3ba 100644
--- a/data/trackers.json
+++ b/data/trackers.json
@@ -44,7 +44,7 @@
         },
         {
             "id": 9,
-            "name": "Comms",
+            "name": "Outreach-Partnerships",
             "default_status": {
                 "id": 1,
                 "name": "New"
@@ -169,4 +169,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/netbot/netbot.py b/netbot/netbot.py
index 9ca3685..75b366c 100755
--- a/netbot/netbot.py
+++ b/netbot/netbot.py
@@ -23,21 +23,27 @@
 CHANNEL_MAPPING = {
     "intake": "External-Comms-Intake",
     "admin-team": "Admin",
-    "outreach": "Comms",
+    "outreach": "Outreach-Partnerships",
+    "mutual-aid": "Mutual-Aid-Action",
     "routing-and-infrastructure": "Infra-Config",
     "installs": "Infra-Field",
+    "repairs": "Infra-Field",
     "network-software": "Software-Dev",
+    "scn-space": "SCN-Space",
     "uw-research-nsf": "Research",
 }
 
 TEAM_MAPPING = {
     "intake": "intake-team",
     "admin-team": "admin-team",
-    "outreach": "comms-team",
+    "outreach": "outreach-team",
+    "mutual-aid": "mutual-aid-team",
     "routing-and-infrastructure": "infra-config-team",
     "installs": "infra-field-team",
+    "repairs": "infra-field-team",
     "network-software": "software-dev-team",
-    "uw-research-nsf": "uw-research-nsf-team",
+    "scn-space": "scn-space-member",
+    "uw-research-nsf": "uw-research-team",
 }
 
 FALLBACK_TEAM = "admin-team"