diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 0f5503dbe0b..fbb7e88ad0f 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -5,50 +5,79 @@ Maintainers
 
 | Name | GitHub | Chat | email
 |------|--------|------|----------------------
-| Alessandro Sorniotti | ale-linux | aso | <ale.linux@sopit.net>
-| Artem Barger | c0rwin | c0rwin | <bartem@il.ibm.com>
-| Brett Logan | btl5037 | btl5037 | <brett.t.logan@ibm.com>
-| Chris Ferris | christo4ferris | cbf | <chris.ferris@gmail.com>
-| Danny Cao | caod123 | caod | <dcao@us.ibm.com>
-| Dave Enyeart | denyeart | dave.enyeart | <enyeart@us.ibm.com>
-| Gari Singh | mastersingh24 | mastersingh24 | <gari.r.singh@gmail.com>
-| Jason Yellick | jyellick | jyellick | <jyellick@us.ibm.com>
-| Jay Guo | guoger | guoger | <guojiannan1101@gmail.com>
-| Jonathan Levi | hacera | JonathanLevi | <jonathan@hacera.com>
-| Manish Sethi | manish-sethi | manish-sethi | <manish.sethi@gmail.com>
-| Matthew Sykes | sykesm | sykesm | <sykesmat@us.ibm.com>
-| Srinivasan Muralidharan | muralisrini | muralisr | <srinivasan.muralidharan99@gmail.com>
-| Yacov Manevich | yacovm | yacovm | <yacovm@il.ibm.com>
+| Alessandro Sorniotti | [ale-linux][ale-linux] | aso | <ale.linux@sopit.net>
+| Brett Logan | [btl5037][btl5037] | btl5037 | <brett.t.logan@ibm.com>
+| Artem Barger | [c0rwin][c0rwin] | c0rwin | <bartem@il.ibm.com>
+| Danny Cao | [caod123][caod123] | caod | <dcao@us.ibm.com>
+| Chris Ferris | [christo4ferris][christo4ferris] | cbf | <chris.ferris@gmail.com>
+| Dave Enyeart | [denyeart][denyeart] | dave.enyeart | <enyeart@us.ibm.com>
+| Jay Guo | [guoger][guoger] | guoger | <guojiannan1101@gmail.com>
+| Jonathan Levi | [hacera][hacera] |JonathanLevi | <jonathan@hacera.com>
+| Jason Yellick | [jyellick][jyellick] | jyellick | <jyellick@us.ibm.com>
+| Manish Sethi | [manish-sethi][manish-sethi] | manish-sethi | <manish.sethi@gmail.com>
+| Gari Singh | [mastersingh24][mastersingh24] | mastersingh24 | <gari.r.singh@gmail.com>
+| Srinivasan Muralidharan | [muralisrini][muralisrini] | muralisr | <srinivasan.muralidharan99@gmail.com>
+| Matthew Sykes | [sykesm][sykesm] | sykesm | <sykesmat@us.ibm.com>
+| Yacov Manevich | [yacovm][yacovm] | yacovm | <yacovm@il.ibm.com>
 
 **Documentation Maintainers**
 
 | Name | GitHub | Chat | email
 |------|--------|------|----------------------
-| Anthony O'Dowd | odowdaibm  | odowdaibm | <a_o-dowd@uk.ibm.com>
-| Chris Gabriel  | denali49   | cmgabriel | <alaskadd@gmail.com>
-| Joe Alewine | joealewine | joe-alewine | <joe.alewine@ibm.com>
-| Nikhil Gupta | nikhil550 | nikhilgupta | <negupta@us.ibm.com>
-| Pam Andrejko | pamandrejko | pandrejko | <pama@ibm.com>
+| Chris Gabriel  | [denali49][denali49] | cmgabriel | <alaskadd@gmail.com>
+| Joe Alewine | [joealewine][joealewine] | joe-alewine | <joe.alewine@ibm.com>
+| Nikhil Gupta | [nikhil550][nikhil550] | nikhilgupta | <negupta@us.ibm.com>
+| Anthony O'Dowd | [odowdaibm][odowdaibm] | odowdaibm | <a_o-dowd@uk.ibm.com>
+| Pam Andrejko | [pamandrejko][pamandrejko] | pandrejko | <pama@ibm.com>
 
 **Release Managers**
 
 | Name | GitHub | Chat | email
 |------|--------|------|----------------------
-| Brett Logan | btl5037 | btl5037 | <brett.t.logan@ibm.com>
-| Chris Ferris | christo4ferris | cbf | <chris.ferris@gmail.com>
-| Dave Enyeart | denyeart | dave.enyeart | <enyeart@us.ibm.com>
-| Gari Singh | mastersingh24 | mastersingh24 | <gari.r.singh@gmail.com>
+| Brett Logan | [btl5037][btl5037] | btl5037 | <brett.t.logan@ibm.com>
+| Chris Ferris | [christo4ferris][christo4ferris] | cbf | <chris.ferris@gmail.com>
+| Dave Enyeart | [denyeart][denyeart] | dave.enyeart | <enyeart@us.ibm.com>
+| Gari Singh | [mastersingh24][mastersingh24] | mastersingh24 | <gari.r.singh@gmail.com>
 
 **Retired Maintainers**
 
 | Name | GitHub | Chat | email
 |------|--------|------|----------------------
-| Gabor Hosszu | gabre | hgabor | <gabor@digitalasset.com>
-| Sheehan Anderson | srderson | sheehan | <sranderson@gmail.com>
-| Tamas Blummer | tamasblummer | tamas | <tamas@digitalasset.com>
-| Jim Zhang | jimthematrix | jimthematrix | <jim_the_matrix@hotmail.com>
-| Yaoguo Jiang | jiangyaoguo | jiangyaoguo | <jiangyaoguo@gmail.com>
-| Greg Haskins | ghaskins | ghaskins | <gregory.haskins@gmail.com>
-| Keith Smith | smithbk | smithbk | <bksmith@us.ibm.com>
-| Binh Nguyen | binhn | binhn | <binh1010010110@gmail.com>
-| Kostas Christidis | kchristidis | kostas | <kostas@gmail.com>
+| Binh Nguyen | [binhn][binhn] | binhn | <binh1010010110@gmail.com>
+| Gabor Hosszu | [gabre][gabre] | hgabor | <gabor@digitalasset.com>
+| Greg Haskins | [ghaskins][ghaskins] | ghaskins | <gregory.haskins@gmail.com>
+| Yaoguo Jiang | [jiangyaoguo][jiangyaoguo] | jiangyaoguo | <jiangyaoguo@gmail.com>
+| Jim Zhang | [jimthematrix][jimthematrix] | jimthematrix | <jim_the_matrix@hotmail.com>
+| Kostas Christidis | [kchristidis][kchristidis] | kostas | <kostas@gmail.com>
+| Keith Smith | [smithbk][smithbk] | smithbk | <bksmith@us.ibm.com>
+| Sheehan Anderson | [srderson][srderson] | sheehan | <sranderson@gmail.com>
+| Tamas Blummer | [tamasblummer][tamasblummer] | tamas | <tamas@digitalasset.com>
+
+[ale-linux]: https://github.com/ale-linux
+[binhn]: https://github.com/binhn
+[btl5037]: https://github.com/btl5037
+[c0rwin]: https://github.com/c0rwin
+[caod123]: https://github.com/caod123
+[christo4ferris]: https://github.com/christo4ferris
+[denali49]: https://github.com/denali49
+[denyeart]: https://github.com/denyeart
+[gabre]: https://github.com/gabre
+[ghaskins]: https://github.com/ghaskins
+[guoger]: https://github.com/guoger
+[hacera]: https://github.com/hacera
+[jiangyaoguo]: https://github.com/jiangyaoguo
+[jimthematrix]: https://github.com/jimthematrix
+[joealewine]: https://github.com/joealewine
+[jyellick]: https://github.com/jyellick
+[kchristidis]: https://github.com/kchristidis
+[manish-sethi]: https://github.com/manish-sethi
+[mastersingh24]: https://github.com/mastersingh24
+[muralisrini]: https://github.com/muralisrini
+[nikhil550]: https://github.com/nikhil550
+[odowdaibm]: https://github.com/odowdaibm
+[pamandrejko]: https://github.com/pamandrejko
+[smithbk]: https://github.com/smithbk
+[srderson]: https://github.com/srderson
+[sykesm]: https://github.com/sykesm
+[tamasblummer]: https://github.com/tamasblummer
+[yacovm]: https://github.com/yacovm