diff --git a/docs/contributors.md b/docs/contributors.md
index e313c973..1af0ea1c 100644
--- a/docs/contributors.md
+++ b/docs/contributors.md
@@ -13,69 +13,96 @@ to see who has been involved already.
 
 Contributions do not constitute an official endorsement.
 
-- **Alibaba**
-  - Ryan Zhang - [@nerdyyatrice](https://github.com/nerdyyatrice)
-  - Haoran Yang, Hongqi Wang
-  - Heng Du - [@duhenglucky](https://github.com/duhenglucky)
-- **Amazon**
-  - Arun Gupta, Ajay Nair, Rob Leidle, Orr Weinstein
-- **commercetools**
-  - Christoph Neijenhuis - [@cneijenhuis](https://github.com/cneijenhuis)
-- **Confluent**
-  - Neil Avery - [@bluemonk3y](https://github.com/bluemonk3y)
-- **Google**
-  - Sarah Allen - [@ultrasaurus](https://github.com/ultrasaurus)
-  - Rachel Myers - [@rachelmyers](https://github.com/rachelmyers)
-  - Thomas Bouldin - [@inlined](https://github.com/inlined)
-  - Mike McDonald, Morgan Hallmon, Robert-Jan Huijsman
-  - Scott Nichols - [@n3wscott](https://github.com/n3wscott)
-  - Jon Skeet - [@jskeet](https://github.com/jskeet)
-- **Huawei**
-  - Cathy Hong Zhang - [@cathyhongzhang](https://github.com/cathyhongzhang)
-  - Louis Fourie - [@lfourie](https://github.com/lfourie)
-- **IBM**
-  - Doug Davis - [@duglin](https://github.com/duglin)
-  - Daniel Krook - [@krook](https://github.com/krook)
-  - Matt Rutkowski - [@mrutkows](https://github.com/mrutkows)
-  - Michael M Behrendt - [@mbehrendt](https://github.com/mbehrendt)
-- **Iguazio**
-  - Yaron Haviv - [@yaronha](https://github.com/yaronha)
-  - Orit Nissan-Messing - [@oritnm](https://github.com/oritnm)
-- **Intel**
-  - David Lyle - [@dklyle](https://github.com/dklyle)
-- **Lightbend**
-  - James Roper - [@jroper](https://github.com/jroper)
-- **Linkall**
-  - Jie Ding - [@jieding](https://github.com/jieding)
-- **Microsoft**
-  - Clemens Vasters - [@clemensv](https://github.com/clemensv)
-  - Bahram Banisadr - [@banisadr](https://github.com/banisadr)
-  - Dan Rosanova - [@djrosanova](https://github.com/djrosanova)
-  - Cesar Ruiz-Meraz, Raja Ravipati
-- **Oracle**
-  - Chad Arimura - [@carimura](https://github.com/banisadr)
-  - Stanley Halka - [@shalka](https://github.com/banisadr)
-  - Travis Reeder - [@treeder](https://github.com/banisadr)
-- **Red Hat**
-  - Jim Curtis - [@jimcurtis64](https://github.com/jimcurtis2)
-  - William Markito Oliveira - [@william_markito](https://github.com/markito)
-  - Gunnar Morling - [@gunnarmorling](https://github.com/gunnarmorling/)
-  - Tihomir Surdilovic - [@tsurdilo](https://github.com/tsurdilo)
-  - Lance Ball - [@lance](https://github.com/lance)
-- **SAP**
-  - Nathan Oyler - [@notque](https://github.com/notque)
-  - Stevo Slavić - [@sslavic](https://github.com/sslavic)
-  - Klaus Deissner - [@deissnerk](https://github.com/deissnerk)
-- **Serverless Inc**
-  - Austen Collins - [@ac360](https://github.com/ac360)
-  - Rupak Ganguly - [@rupakg](https://github.com/rupakg)
-  - Brian Neisler - [@brianneisler](https://github.com/brianneisler)
-  - Jeremy Coffield, Ganesh Radhakirshnan
-- **SolarWinds**
-  - Lee Calcote - [@leecalcote](https://github.com/leecalcote)
-- **VMWare**
-  - Mark Peek - [@markpeek](https://github.com/markpeek)
-- **Individuals**
-  - Rémi Cattiau - [@loopingz](https://github.com/loopingz)
-  - Jem Day - [@JemDay](https://github.com/JemDay)
-  - Vladimir Bacvanski
+# A
+- Sarah Allen - [@ultrasaurus](https://github.com/ultrasaurus)
+- Chad Arimura - [@carimura](https://github.com/banisadr)  
+- Neil Avery - [@bluemonk3y](https://github.com/bluemonk3y)
+
+# B
+- Vladimir Bacvanski
+- Lance Ball - [@lance](https://github.com/lance)
+- Bahram Banisadr - [@banisadr](https://github.com/banisadr)
+- Michael M Behrendt - [@mbehrendt](https://github.com/mbehrendt)
+- Thomas Bouldin - [@inlined](https://github.com/inlined)
+
+# C
+- Rémi Cattiau - [@loopingz](https://github.com/loopingz)
+- Lee Calcote - [@leecalcote](https://github.com/leecalcote)
+- Jeremy Coffield
+- Austen Collins - [@ac360](https://github.com/ac360)
+- Jim Curtis - [@jimcurtis64](https://github.com/jimcurtis2)
+
+# D
+- Doug Davis - [@duglin](https://github.com/duglin)
+- Jem Day - [@JemDay](https://github.com/JemDay)
+- Klaus Deissner - [@deissnerk](https://github.com/deissnerk)
+- Jie Ding - [@jieding](https://github.com/jieding)
+- Heng Du - [@duhenglucky](https://github.com/duhenglucky)
+
+# F
+- Louis Fourie - [@lfourie](https://github.com/lfourie)
+
+# G
+- Rupak Ganguly - [@rupakg](https://github.com/rupakg)
+- Arun Gupta
+
+# H
+- Stanley Halka - [@shalka](https://github.com/banisadr)
+- Morgan Hallmon
+- Yaron Haviv - [@yaronha](https://github.com/yaronha)
+- Robert-Jan Huijsman
+
+# K
+- Daniel Krook - [@krook](https://github.com/krook)
+
+# L
+- Rob Leidle
+- David Lyle - [@dklyle](https://github.com/dklyle)
+
+# M
+- Mike McDonald
+- Gunnar Morling - [@gunnarmorling](https://github.com/gunnarmorling/)
+- Rachel Myers - [@rachelmyers](https://github.com/rachelmyers)
+- Calum Murray - [@Cali0707](https://github.com/Cali0707/)
+
+# N
+- Ajay Nair
+- Christoph Neijenhuis - [@cneijenhuis](https://github.com/cneijenhuis)
+- Brian Neisler - [@brianneisler](https://github.com/brianneisler)
+- Scott Nichols - [@n3wscott](https://github.com/n3wscott)
+- Orit Nissan-Messing - [@oritnm](https://github.com/oritnm)
+
+# O
+- William Markito Oliveira - [@william_markito](https://github.com/markito)
+- Nathan Oyler - [@notque](https://github.com/notque)
+
+# P
+- Mark Peek - [@markpeek](https://github.com/markpeek)
+
+# R
+- Ganesh Radhakirshnan
+- Raja Ravipati
+- Travis Reeder - [@treeder](https://github.com/banisadr)
+- James Roper - [@jroper](https://github.com/jroper)
+- Dan Rosanova - [@djrosanova](https://github.com/djrosanova)
+- Cesar Ruiz-Meraz
+- Matt Rutkowski - [@mrutkows](https://github.com/mrutkows)
+
+# S
+- Jon Skeet - [@jskeet](https://github.com/jskeet)
+- Stevo Slavić - [@sslavic](https://github.com/sslavic)
+- Tihomir Surdilovic - [@tsurdilo](https://github.com/tsurdilo)
+
+# V
+- Clemens Vasters - [@clemensv](https://github.com/clemensv)
+
+# W
+- Hongqi Wang
+- Orr Weinstein
+
+# Y
+- Haoran Yang
+
+# Z
+- Cathy Hong Zhang - [@cathyhongzhang](https://github.com/cathyhongzhang)
+- Ryan Zhang - [@nerdyyatrice](https://github.com/nerdyyatrice)
\ No newline at end of file