diff --git a/affiliated/registry.json b/affiliated/registry.json
index e4d71521..64c01108 100644
--- a/affiliated/registry.json
+++ b/affiliated/registry.json
@@ -137,7 +137,7 @@
         },
         {
             "name": "specutils",
-            "maintainer": "Nicholas Earl, Adam Ginsburg, Ricky O'Steen, and Erik Tollerud",
+            "maintainer": "Ricky O'Steen, Adam Ginsburg, and Erik Tollerud <rosteen@stsci.edu>",
             "stable": false,
             "home_url": "https://specutils.readthedocs.io",
             "repo_url": "https://github.com/astropy/specutils",
@@ -157,7 +157,7 @@
         },
         {
             "name": "specreduce",
-            "maintainer": "Tim Pickering and Erik Tollerud",
+            "maintainer": "Tim Pickering, Erik Tollerud, Kyle Conroy, Clare Shanahan, and Hannu Parviainen <te.pickering@gmail.com>",
             "stable": false,
             "home_url": "https://specreduce.readthedocs.io",
             "repo_url": "https://github.com/astropy/specreduce",
@@ -177,7 +177,7 @@
         },
         {
             "name": "astroquery",
-            "maintainer": "Adam Ginsburg and Brigitta Sipőcz <adam.g.ginsburg@gmail.com>",
+            "maintainer": "Adam Ginsburg and Brigitta Sipőcz <astropy.astroquery@gmail.com>",
             "stable": true,
             "home_url": "https://astroquery.readthedocs.io",
             "repo_url": "https://github.com/astropy/astroquery",
@@ -197,7 +197,7 @@
         },
         {
             "name": "photutils",
-            "maintainer": "Larry Bradley and Brigitta Sipőcz <lbradley@stsci.edu>",
+            "maintainer": "Larry Bradley <lbradley@stsci.edu>",
             "stable": false,
             "home_url": "https://photutils.readthedocs.io/",
             "repo_url": "https://github.com/astropy/photutils",
@@ -317,7 +317,7 @@
         },
         {
             "name": "reproject",
-            "maintainer": "Thomas Robitaille <thomas.robitaille@gmail.com>",
+            "maintainer": "Thomas Robitaille, Stuart Mumford, and Sam Van Kooten <thomas.robitaille@gmail.com>",
             "stable": true,
             "home_url": "https://reproject.readthedocs.io",
             "repo_url": "https://github.com/astropy/reproject",
@@ -817,7 +817,7 @@
         },
         {
             "name": "regions",
-            "maintainer": "Larry Bradley and Adam Ginsburg",
+            "maintainer": "Larry Bradley and Adam Ginsburg <lbradley@stsci.edu>",
             "stable": false,
             "repo_url": "https://github.com/astropy/regions",
             "home_url": "https://astropy-regions.readthedocs.io",
@@ -857,7 +857,7 @@
         },
         {
            "name": "astropy-healpix",
-           "maintainer": "Thomas Robitaille <thomas.robitaille@gmail.com> and Leo Singer <leo.p.singer@nasa.gov>",
+           "maintainer": "Leo Singer and Thomas Robitaille <leo.p.singer@nasa.gov>",
            "stable": false,
            "repo_url": "https://github.com/astropy/astropy-healpix",
            "home_url": "https://astropy-healpix.readthedocs.io/",
diff --git a/roles.json b/roles.json
index ef8a5439..1120488f 100644
--- a/roles.json
+++ b/roles.json
@@ -161,7 +161,7 @@
                 "people": [
                     "Stuart Mumford"
                 ]
-            },            
+            },
             {
                 "role": "Conferences",
                 "people": [
@@ -174,7 +174,7 @@
                 "people": [
                     "Brett Morris"
                 ]
-            },            
+            },
             {
                 "role": "Mastodon",
                 "people": [
@@ -350,7 +350,7 @@
                 ]
             }
 
-        ],        
+        ],
         "responsibilities": [
             {
                 "subrole-head": "Technical Lead",
@@ -579,24 +579,25 @@
         "role-head": "Astropy coordinated package maintainer",
         "sub-roles": [
             {
-                "role": "astroquery",
+                "role": "asdf-astropy",
                 "people": [
-                    "Clara Brasseur",
-                    "Adam Ginsburg",
-                    "Brigitta Sip\u0151cz"
+                    "Brett Graham",
+                    "Nadia Dencheva",
+                    "Perry Greenfield"
                 ]
             },
             {
                 "role": "astropy-healpix",
                 "people": [
-                    "Thomas Robitaille",
-                    "Leo Singer"
+                    "Leo Singer",
+                    "Thomas Robitaille"
                 ]
             },
             {
-                "role": "photutils",
+                "role": "astroquery",
                 "people": [
-                    "Larry Bradley"
+                    "Adam Ginsburg",
+                    "Brigitta Sip\u0151cz"
                 ]
             },
             {
@@ -606,19 +607,9 @@
                 ]
             },
             {
-                "role": "specutils",
-                "people": [
-                    "Adam Ginsburg",
-                    "Ricky O'Steen",
-                    "Erik Tollerud"
-                ]
-            },
-            {
-                "role": "reproject",
+                "role": "photutils",
                 "people": [
-                    "Stuart Mumford",
-                    "Thomas Robitaille",
-                    "Sam Van Kooten"
+                    "Larry Bradley"
                 ]
             },
             {
@@ -629,11 +620,11 @@
                 ]
             },
             {
-                "role": "asdf-astropy",
+                "role": "reproject",
                 "people": [
-                    "Nadia Dencheva",
-                    "Perry Greenfield",
-                    "Brett Graham"
+                    "Thomas Robitaille",
+                    "Stuart Mumford",
+                    "Sam Van Kooten"
                 ]
             },
             {
@@ -645,6 +636,14 @@
                     "Clare Shanahan",
                     "Hannu Parviainen"
                 ]
+            },
+            {
+                "role": "specutils",
+                "people": [
+                    "Ricky O'Steen",
+                    "Adam Ginsburg",
+                    "Erik Tollerud"
+                ]
             }
         ],
         "responsibilities": {