diff --git a/_data/team/roles/code_of_conduct.yml b/_data/team/roles/code_of_conduct.yml
index b133f459..fc4d39c4 100644
--- a/_data/team/roles/code_of_conduct.yml
+++ b/_data/team/roles/code_of_conduct.yml
@@ -9,5 +9,5 @@ tasks:
 
 current_members:
   - "[Jenna Swarthout Goddard](https://github.com/jennaswa)"
-  - Richard Gowers
-  - Micaela Matta
+  - "[Micaela Matta](https://github.com/micaela-matta)"
+  - "[Yuxuan Zhuang](https://github.com/yuxuanzhuang)"
diff --git a/_data/team/roles/community_engagement.yml b/_data/team/roles/community_engagement.yml
index 41114045..db2813df 100644
--- a/_data/team/roles/community_engagement.yml
+++ b/_data/team/roles/community_engagement.yml
@@ -4,4 +4,7 @@ tasks:
   - Managing and triaging conversations on Discord and GitHub Discussions
 
 current_members:
-  - Jenna Swarthout Goddard
+  - "[Jenna Swarthout Goddard](https://github.com/jennaswa)"
+  - "[Yuxuan Zhuang](https://github.com/yuxuanzhuang)"
+  - "[Rocco Meli](https://github.com/RMeli)"
+  - "[Oliver Beckstein](https://github.com/orbeckst)"
diff --git a/_data/team/roles/continuous_integration.yml b/_data/team/roles/continuous_integration.yml
index adca3293..9473c74e 100644
--- a/_data/team/roles/continuous_integration.yml
+++ b/_data/team/roles/continuous_integration.yml
@@ -5,6 +5,7 @@ tasks:
   - Maintenance and fixes
 
 current_members:
-  - Fiona Naughton
-  - Irfan Alibay
-  - Richard Gowers
\ No newline at end of file
+  - "[Fiona Naughton](https://github.com/fiona-naughton)"
+  - "[Irfan Alibay](https://github.com/IAlibay)"
+  - "[Richard Gowers](https://github.com/richardjgowers)"
+  - "[Yuxuan Zhuang](https://github.com/yuxuanzhuang)"
\ No newline at end of file
diff --git a/_data/team/roles/core_library_maintenance.yml b/_data/team/roles/core_library_maintenance.yml
index 7516a200..2137c078 100644
--- a/_data/team/roles/core_library_maintenance.yml
+++ b/_data/team/roles/core_library_maintenance.yml
@@ -9,17 +9,17 @@ subroles:
       - Initial triage and tagging of issues
       - Managing timely responses and resolving issues
     current_members:
-      - Rocco Meli
-      - Hugo MacDermott-Opeskin
+      - "[Rocco Meli](https://github.com/RMeli)"
+      - "[Hugo MacDermott-Opeskin](https://github.com/hmacdope)"
     
 
   - subrole: Pull request management
     tasks:
       - Reviewing, shepherding, and merging pull requests
     current_members:
-      - Oliver Beckstein
-      - Rocco Meli
-      - Hugo MacDermott-Opeskin
+      - "[Oliver Beckstein](https://github.com/orbeckst)"
+      - "[Rocco Meli](https://github.com/RMeli)"
+      - "[Hugo MacDermott-Opeskin](https://github.com/hmacdope)"
     
   
   - subrole: General maintenance
@@ -30,4 +30,5 @@ subroles:
       - Emergency fixes
       - Other general maintenance tasks
     current_members:
-      - Irfan Alibay
+      - "[Irfan Alibay](https://github.com/IAlibay)"
+      - "[Yuxuan Zhuang](https://github.com/yuxuanzhuang)"
\ No newline at end of file
diff --git a/_data/team/roles/documentation.yml b/_data/team/roles/documentation.yml
index 44af3c35..3ec6a8bf 100644
--- a/_data/team/roles/documentation.yml
+++ b/_data/team/roles/documentation.yml
@@ -8,7 +8,7 @@ tasks:
   - Responding to documentation issues in sub-projects
 
 current_members:
-  - Lily Wang
-  - Rocco Meli
+  - "[Lily Wang](https://github.com/lilyminium)"
+  - "[Rocco Meli](https://github.com/RMeli)"
 
 
diff --git a/_data/team/roles/external_liaison.yml b/_data/team/roles/external_liaison.yml
index 15278165..ee3a5176 100644
--- a/_data/team/roles/external_liaison.yml
+++ b/_data/team/roles/external_liaison.yml
@@ -5,6 +5,6 @@ tasks:
   - Coordinate with potential industry partners
 
 current_members:
-  - Irfan Alibay
-  - Oliver Beckstein
-  - Jenna Swarthout Goddard
+  - "[Irfan Alibay](https://github.com/IAlibay)"
+  - "[Oliver Beckstein](https://github.com/orbeckst)"
+  - "[Jenna Swarthout Goddard](https://github.com/jennaswa)"
diff --git a/_data/team/roles/mdakit_registry.yml b/_data/team/roles/mdakit_registry.yml
index 393fd8e7..a849ff27 100644
--- a/_data/team/roles/mdakit_registry.yml
+++ b/_data/team/roles/mdakit_registry.yml
@@ -5,8 +5,8 @@ tasks:
   - Managing automated test and badge infrastructure of all MDAKits
   - Manage helping with MDAKits who need assistance
 current_members:
-  - Irfan Alibay
-  - Fiona Naughton
-  - Lily Wang
-  - Oliver Beckstein
+  - "[Irfan Alibay](https://github.com/IAlibay)"
+  - "[Fiona Naughton](https://github.com/fiona-naughton)"
+  - "[Lily Wang](https://github.com/lilyminium)"
+  - "[Oliver Beckstein](https://github.com/orbeckst)"
 
diff --git a/_data/team/roles/non_core_library_maintenance.yml b/_data/team/roles/non_core_library_maintenance.yml
index 690f801c..869fdd87 100644
--- a/_data/team/roles/non_core_library_maintenance.yml
+++ b/_data/team/roles/non_core_library_maintenance.yml
@@ -13,52 +13,54 @@ subroles:
 
   - subrole: distopia
     current_members:
-      - Richard Gowers
-      - Hugo MacDermott-Opeskin
-      - Rocco Meli
+      - "[Richard Gowers](https://github.com/richardjgowers)"
+      - "[Hugo MacDermott-Opeskin](https://github.com/hmacdope)"
 
   - subrole: cookiecutter-mdakit
     current_members:
-      - Lily Wang
-      - Irfan Alibay
+      - "[Lily Wang](https://github.com/lilyminium)"
+      - "[Irfan Alibay](https://github.com/IAlibay)"
 
   - subrole: mda-encore
-    current_members: []
+    current_members:
+      - "[Kristoffer Enøe Johansson](https://github.com/enoee)" (external developer)
+      - "[Kresten Lindorff-Larsen](https://github.com/lindorff-larsen)" (external developer)
+      - "[Yuxuan Zhuang](https://github.com/yuxuanzhuang)"
     
   - subrole: hole2-mdakit
     current_members:
-      - Lily Wang    
+      - "[Lily Wang](https://github.com/lilyminium)"
 
   - subrole: benchmarks
     current_members:
-      - Oliver Beckstein    
+      - "[Oliver Beckstein](https://github.com/orbeckst)"
 
   - subrole: GridDataFormats
     current_members:
-      - Irfan Alibay
-      - Oliver Beckstein
+      - "[Irfan Alibay](https://github.com/IAlibay)"
+      - "[Oliver Beckstein](https://github.com/orbeckst)"
   
   - subrole: MDAnalysisData
     current_members:
-      - Irfan Alibay
-      - Oliver Beckstein
+      - "[Irfan Alibay](https://github.com/IAlibay)"
+      - "[Oliver Beckstein](https://github.com/orbeckst)"
   
   - subrole: mda-xrlib and other utilities
     current_members:
-      - Irfan Alibay    
+      - "[Irfan Alibay](https://github.com/IAlibay)"
   
   - subrole: pyedr
     current_members:
-      - Irfan Alibay
+      - "[Irfan Alibay](https://github.com/IAlibay)"
 
   - subrole: pytng
     current_members:
-      - Hugo MacDermott-Opeskin
+      - "[Hugo MacDermott-Opeskin](https://github.com/hmacdope)"
 
   - subrole: PathSimAnalysis
     current_members:
-      - Oliver Beckstein
+      - "[Oliver Beckstein](https://github.com/orbeckst)"
 
   - subrole: waterdynamics
     current_members:
-      - Fiona Naughton
+      - "[Fiona Naughton](https://github.com/fiona-naughton)"
diff --git a/_data/team/roles/outreach.yml b/_data/team/roles/outreach.yml
index 2f3b7b2d..b58a7a72 100644
--- a/_data/team/roles/outreach.yml
+++ b/_data/team/roles/outreach.yml
@@ -7,8 +7,8 @@ subroles:
     - Gathering and coordinating volunteers
     - Managing content, presentations and teaching at workshops
     current_members:
-      - Jenna Swarthout Goddard
-      - Micaela Matta
+      - "[Jenna Swarthout Goddard](https://github.com/jennaswa)"
+      - "[Micaela Matta](https://github.com/micaela-matta)"
   
   - subrole: Mentoring programs
     tasks:
@@ -16,13 +16,13 @@ subroles:
       - Advertising opportunities for mentoring programs
       - Mentoring in structured programs
     current_members:
-      - Jenna Swarthout Goddard
+      - "[Jenna Swarthout Goddard](https://github.com/jennaswa)"
     
   - subrole: Teaching materials
     tasks:
       - Managing teaching materials on GitHub for workshops and events
       - Maintaining and fixing materials
     current_members:
-      - Rocco Meli
-      - Micaela Matta
-      - Jenna Swarthout Goddard
+      - "[Rocco Meli](https://github.com/RMeli)"
+      - "[Micaela Matta](https://github.com/micaela-matta)"
+      - "[Jenna Swarthout Goddard](https://github.com/jennaswa)"
diff --git a/_data/team/roles/project_organization.yml b/_data/team/roles/project_organization.yml
index ae2c47bd..dc575cab 100644
--- a/_data/team/roles/project_organization.yml
+++ b/_data/team/roles/project_organization.yml
@@ -7,4 +7,5 @@ tasks:
   - Gathering usage and community metrics
 
 current_members:
-  - Jenna Swarthout Goddard
+  - "[Jenna Swarthout Goddard](https://github.com/jennaswa)"
+  - "[Irfan Alibay](https://github.com/IAlibay)"
diff --git a/_data/team/roles/releases_and_deployment.yaml b/_data/team/roles/releases_and_deployment.yaml
index 730da727..334c05b3 100644
--- a/_data/team/roles/releases_and_deployment.yaml
+++ b/_data/team/roles/releases_and_deployment.yaml
@@ -6,5 +6,5 @@ tasks:
   - Carrying out releases for MDAnalysis project packages
   - Managing released packages on conda-forge and PyPi
 current_members:
-  - Irfan Alibay
-  - Fiona Naughton
+  - "[Irfan Alibay](https://github.com/IAlibay)"
+  - "[Fiona Naughton](https://github.com/fiona-naughton)"
diff --git a/_data/team/roles/relicensing_coordinator.yml b/_data/team/roles/relicensing_coordinator.yml
index 0968f619..aea869f8 100644
--- a/_data/team/roles/relicensing_coordinator.yml
+++ b/_data/team/roles/relicensing_coordinator.yml
@@ -7,5 +7,5 @@ tasks:
   - Managing the switch to a new license
 
 current_members:
-  - Irfan Alibay
-  - Oliver Beckstein
+  - "[Irfan Alibay](https://github.com/IAlibay)"
+  - "[Oliver Beckstein](https://github.com/orbeckst)"
diff --git a/_data/team/roles/social_media.yml b/_data/team/roles/social_media.yml
index 2bba8a63..15c9d95a 100644
--- a/_data/team/roles/social_media.yml
+++ b/_data/team/roles/social_media.yml
@@ -3,7 +3,7 @@ tasks:
   - General management and administration
   - Posting announcements of new developments
   - Moderating content
-  - Managing X and LinkedIn
+  - Managing X, LinkedIn, and Bluesky
   - Managing new content to the MDAnalysis website and blog
 current_members:
-  - Jenna Swarthout Goddard
+  - "[Jenna Swarthout Goddard](https://github.com/jennaswa)"
diff --git a/pages/team.md b/pages/team.md
index 08f9baa8..fae0891e 100644
--- a/pages/team.md
+++ b/pages/team.md
@@ -6,7 +6,7 @@ order: 4
 
 MDAnalysis is a community-driven project that is made possible through the efforts of many members who contribute in numerous and diverse ways, ranging from direct package development, maintenance, documentation, communication, and managerial responsibilities. On this page we list identified project roles and team members for each of those roles. We note that the listed roles on this page can differ significantly in scope and required effort.
 
-We also invite community members to reach out to mdanalysis@numfocus.org or the current team members if they are interested in filling missing roles or joining an existing team!
+We also invite community members to reach out to [mdanalysis@numfocus.org](mailto:mdanalysis@numfocus.org) or the current team members (whose GitHub profiles are linked in the [Roles](#roles) section) if they are interested in filling missing roles, joining an existing team, or making any other inquiries about MDAnalysis community efforts.
 
 ## Roles