diff --git a/.mailmap b/.mailmap
index e1146596b0..ff23a75afd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,6 +32,7 @@ Aman Agrawal <amanagr@zulip.com> <f2016561@pilani.bits-pilani.ac.in>
 Anders Kaseorg <anders@zulip.com> <anders@zulipchat.com>
 Anders Kaseorg <anders@zulip.com> <andersk@mit.edu>
 aparna-bhatt <aparnabhatt2001@gmail.com> <86338542+aparna-bhatt@users.noreply.github.com>
+Apoorva Pendse <apoorvavpendse@gmail.com>
 Aryan Bhokare <aryan1bhokare@gmail.com>
 Aryan Bhokare <aryan1bhokare@gmail.com> <92683836+aryan-bhokare@users.noreply.github.com>
 Aryan Shridhar <aryanshridhar7@gmail.com>
@@ -64,6 +65,8 @@ Greg Price <greg@zulip.com> <gnprice@gmail.com>
 Greg Price <greg@zulip.com> <greg@zulipchat.com>
 Greg Price <greg@zulip.com> <price@mit.edu>
 Hardik Dharmani <Ddharmani99@gmail.com> <ddharmani99@gmail.com>
+Harsh <reharshmeena@gmail.com> <116981900+reharsh@users.noreply.github.com>
+Harsh Bansal <harsh@harshbansal.in>
 Hemant Umre <hemantumre12@gmail.com> <87542880+HemantUmre12@users.noreply.github.com>
 Jai soni <jai_s@me.iitr.ac.in>
 Jai soni <jai_s@me.iitr.ac.in> <76561593+jai2201@users.noreply.github.com>
@@ -71,16 +74,23 @@ Jeff Arnold <jbarnold@gmail.com> <jbarnold@humbughq.com>
 Jeff Arnold <jbarnold@gmail.com> <jbarnold@zulip.com>
 Jessica McKellar <jesstess@mit.edu> <jesstess@humbughq.com>
 Jessica McKellar <jesstess@mit.edu> <jesstess@zulip.com>
+Jitendra Kumar <jk69854@gmail.com>
+Jitendra Kumar <jk69854@gmail.com> <36557466+jitendra-ky@users.noreply.github.com>
 John Lu <JohnLu10212004@gmail.com>
 John Lu <JohnLu10212004@gmail.com> <87673068+JohnLu2004@users.noreply.github.com>
 Joseph Ho <josephho678@gmail.com>
 Joseph Ho <josephho678@gmail.com> <62449508+Joelute@users.noreply.github.com>
 Julia Bichler <julia.bichler@tum.de> <74348920+juliaBichler01@users.noreply.github.com>
 Karl Stolley <karl@zulip.com> <karl@stolley.dev>
+Kartikay Sambher <kartikaysambher@gmail.com>
 Kevin Mehall <km@kevinmehall.net> <kevin@humbughq.com>
 Kevin Mehall <km@kevinmehall.net> <kevin@zulip.com>
 Kevin Scott <kevin.scott.98@gmail.com>
 Kislay Verma <kislayuv27@gmail.com>
+Klara Brrettby <klara.bratteby@gmail.com>
+Klara Brrettby <klara.bratteby@gmail.com> <93648999+klarabratteby@users.noreply.github.com>
+Kumar Aniket <sachinaniket2004@gmail.com>
+Kumar Aniket <sachinaniket2004@gmail.com> <142340063+opmkumar@users.noreply.github.com>
 Kunal Sharma <v.shm.kunal@gmail.com>
 Lalit Kumar Singh <lalitkumarsingh3716@gmail.com>
 Lalit Kumar Singh <lalitkumarsingh3716@gmail.com> <lalits01@smartek21.com>
@@ -88,6 +98,7 @@ Lauryn Menard <lauryn@zulip.com> <63245456+laurynmm@users.noreply.github.com>
 Lauryn Menard <lauryn@zulip.com> <lauryn.menard@gmail.com>
 m-e-l-u-h-a-n <purushottam.tiwari.cd.cse19@itbhu.ac.in>
 m-e-l-u-h-a-n <purushottam.tiwari.cd.cse19@itbhu.ac.in> <pururshottam.tiwari.cd.cse19@itbhu.ac.in>
+Maneesh Shukla <shuklamaneesh24@gmail.com> <143504391+shuklamaneesh23@users.noreply.github.com>
 Mateusz Mandera <mateusz.mandera@zulip.com> <mateusz.mandera@protonmail.com>
 Matt Keller <matt@zulip.com>
 Matt Keller <matt@zulip.com> <m@cognusion.com>
@@ -100,6 +111,7 @@ Palash Baderia <palash.baderia@outlook.com>
 Palash Baderia <palash.baderia@outlook.com> <66828942+palashb01@users.noreply.github.com>
 Palash Raghuwanshi <singhpalash0@gmail.com>
 Parth <mittalparth22@gmail.com>
+Prakhar Pratyush <prakhar@zulip.com> <prakhar841301@gmail.com>
 Pratik Chanda <pratikchanda2000@gmail.com>
 Pratik Solanki <pratiksolanki2021@gmail.com>
 Priyam Seth <sethpriyam1@gmail.com> <b19188@students.iitmandi.ac.in>
@@ -110,6 +122,7 @@ Rishabh Maheshwari <b20063@students.iitmandi.ac.in>
 Rishi Gupta <rishig@zulipchat.com> <rishig+git@mit.edu>
 Rishi Gupta <rishig@zulipchat.com> <rishig@kandralabs.com>
 Rishi Gupta <rishig@zulipchat.com> <rishig@users.noreply.github.com>
+Ritwik Patnaik <ritwikpatnaik@gmail.com>
 Rixant Rokaha <rixantrokaha@gmail.com>
 Rixant Rokaha <rixantrokaha@gmail.com> <rishantrokaha@gmail.com>
 Rixant Rokaha <rixantrokaha@gmail.com> <rrokaha@caldwell.edu>
@@ -125,6 +138,7 @@ Shashank Singh <21bec103@iiitdmj.ac.in>
 Shlok Patel <shlokcpatel2001@gmail.com>
 Shu Chen <shu@zulip.com>
 Shubham Padia <shubham@zulip.com>
+Shubham Padia <shubham@zulip.com> <shubham-padia@users.noreply.github.com>
 Shubham Padia <shubham@zulip.com> <shubham@glints.com>
 Somesh Ranjan <somesh.ranjan.met20@itbhu.ac.in> <77766761+somesh202@users.noreply.github.com>
 Steve Howell <showell@zulip.com> <showell30@yahoo.com>
@@ -148,8 +162,11 @@ umkay <ukhan@zulipchat.com> <umkay@users.noreply.github.com>
 Viktor Illmer <1476338+v-ji@users.noreply.github.com>
 Vishnu KS <vishnu@zulip.com> <hackerkid@vishnuks.com>
 Vishnu KS <vishnu@zulip.com> <yo@vishnuks.com>
+Vivek Tripathi <vivektripathi8005@gmail.com>
 Waseem Daher <wdaher@zulip.com> <wdaher@dropbox.com>
 Waseem Daher <wdaher@zulip.com> <wdaher@humbughq.com>
+whilstsomebody <vishwakarmarambhawan572@gmail.com>
+whilstsomebody <vishwakarmarambhawan572@gmail.com> <185982038+whilstsomebody@users.noreply.github.com>
 Yash RE <33805964+YashRE42@users.noreply.github.com>
 Yash RE <33805964+YashRE42@users.noreply.github.com> <YashRE42@github.com>
 Yogesh Sirsat <yogeshsirsat56@gmail.com>