diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index f5a2fb29..50da8091 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -3,16 +3,16 @@
 
 ## Current
 
-The [@go-tuf-maintainers team](https://github.com/orgs/theupdateframework/teams/go-tuf-maintainers) is:
+The [@theupdateframework/go-tuf-maintainers](https://github.com/orgs/theupdateframework/teams/go-tuf-maintainers) team is:
 
-| Maintainer                 | GitHub ID                                                 | Affiliation |
-| -------------------------- | --------------------------------------------------------- | ----------- |
-| Fredrik Skogman            | [kommendorkapten](https://github.com/kommendorkapten)     | @GitHub     |
-| Joshua Lock                | [joshuagl](https://github.com/joshuagl)                   | @Verizon    |
-| Marina Moore               | [mnm678](https://github.com/mnm678)                       | NYU         |
-| Marvin Drees               | [MDr164](https://github.com/MDr164)                       | @9elements  |
-| Radoslav Dimitrov          | [rdimitrov](https://github.com/rdimitrov)                 | @Stacklok   |
-| Trishank Karthik Kuppusamy | [trishankatdatadog](https://github.com/trishankatdatadog) | @DataDog    |
+| Maintainer                 | GitHub ID                                                  | Affiliation                                |
+| -------------------------- | ---------------------------------------------------------- | ------------------------------------------ |
+| Fredrik Skogman            | [@kommendorkapten](https://github.com/kommendorkapten)     | [@GitHub](https://github.com/github)       |
+| Joshua Lock                | [@joshuagl](https://github.com/joshuagl)                   | [@Verizon](https://github.com/verizon)     |
+| Marina Moore               | [@mnm678](https://github.com/mnm678)                       | NYU                                        |
+| Marvin Drees               | [@MDr164](https://github.com/MDr164)                       | [@9elements](https://github.com/9elements) |
+| Radoslav Dimitrov          | [@rdimitrov](https://github.com/rdimitrov)                 | [@Stacklok](https://github.com/stacklok)   |
+| Trishank Karthik Kuppusamy | [@trishankatdatadog](https://github.com/trishankatdatadog) | [@DataDog](https://github.com/DataDog)     |
 
 ## Emeritus
 
@@ -20,4 +20,4 @@ We are deeply indebted to our emeritus maintainers below:
 
 | Maintainer         | GitHub ID                                                 | Affiliation |
 | ------------------ | --------------------------------------------------------- | ----------- |
-| Zack Newman        | [znewman01](https://github.com/znewman01)                 | N/A         |
+| Zack Newman        | [@znewman01](https://github.com/znewman01)                | N/A         |