diff --git a/.all-contributorsrc b/.all-contributorsrc
index 5c0b213793..984fde10e5 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -20,15 +20,64 @@
       "login": "robsavoye",
       "name": "Rob Savoye",
       "avatar_url": "https://avatars.githubusercontent.com/u/71342768?v=4",
-      "profile": "https://www.hotosm.org",
+      "profile": "https://github.com/robsavoye",
       "contributions": ["maintenance", "mentoring", "code", "review", "ideas"]
     },
+    {
+      "login": "ramyaragupathy",
+      "name": "Ramya",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12103383?v=4",
+      "profile": "https://github.com/ramyaragupathy",
+      "contributions": ["bug"]
+    },
     {
       "login": "spwoodcock",
       "name": "Sam",
       "avatar_url": "https://avatars.githubusercontent.com/u/78538841?v=4",
-      "profile": "https://github.com/spwoodcock",
-      "contributions": ["code", "review", "infra", "ideas", "maintenance"]
+      "profile": "https://spwoodcock.dev",
+      "contributions": [
+        "code",
+        "review",
+        "infra",
+        "ideas",
+        "maintenance",
+        "mentoring"
+      ]
+    },
+    {
+      "login": "susmina94",
+      "name": "Susmina_Manandhar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/108750444?v=4",
+      "profile": "https://github.com/susmina94",
+      "contributions": ["doc", "ideas", "bug", "mentoring"]
+    },
+    {
+      "login": "manjitapandey",
+      "name": "Manjita Pandey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97273021?v=4",
+      "profile": "https://github.com/manjitapandey",
+      "contributions": [
+        "bug",
+        "doc",
+        "ideas",
+        "content",
+        "design",
+        "projectManagement"
+      ]
+    },
+    {
+      "login": "Sujanadh",
+      "name": "Sujan Adhikari",
+      "avatar_url": "https://avatars.githubusercontent.com/u/109404840?v=4",
+      "profile": "https://github.com/Sujanadh",
+      "contributions": ["code", "maintenance"]
+    },
+    {
+      "login": "NSUWAL123",
+      "name": "Nishit Suwal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/81785002?v=4",
+      "profile": "https://github.com/NSUWAL123",
+      "contributions": ["code", "maintenance"]
     },
     {
       "login": "varun2948",
@@ -58,13 +107,6 @@
       "profile": "https://www.hotosm.org/people/petya-kangalova/",
       "contributions": ["doc", "eventOrganizing", "ideas"]
     },
-    {
-      "login": "Sujanadh",
-      "name": "Sujan Adhikari",
-      "avatar_url": "https://avatars.githubusercontent.com/u/109404840?v=4",
-      "profile": "https://github.com/Sujanadh",
-      "contributions": ["code", "maintenance"]
-    },
     {
       "login": "Mudi-business",
       "name": "Mohamed Bakari Mohamed",
@@ -72,13 +114,6 @@
       "profile": "http://zanrevenue.org",
       "contributions": ["code"]
     },
-    {
-      "login": "NSUWAL123",
-      "name": "Nishit Suwal",
-      "avatar_url": "https://avatars.githubusercontent.com/u/81785002?v=4",
-      "profile": "https://github.com/NSUWAL123",
-      "contributions": ["code", "maintenance"]
-    },
     {
       "login": "biomassives",
       "name": "G. Willson",
@@ -150,18 +185,81 @@
       "contributions": ["code"]
     },
     {
-      "login": "manjitapandey",
-      "name": "Manjita Pandey",
-      "avatar_url": "https://avatars.githubusercontent.com/u/97273021?v=4",
-      "profile": "https://github.com/manjitapandey",
-      "contributions": ["bug", "doc", "ideas"]
+      "login": "shushila21",
+      "name": "shushila21",
+      "avatar_url": "https://avatars.githubusercontent.com/u/77854807?v=4",
+      "profile": "https://github.com/shushila21",
+      "contributions": ["code"]
     },
     {
-      "login": "susmina94",
-      "name": "Susmina_Manandhar",
-      "avatar_url": "https://avatars.githubusercontent.com/u/108750444?v=4",
-      "profile": "https://github.com/susmina94",
-      "contributions": ["doc", "ideas", "bug"]
+      "login": "kshitijrajsharma",
+      "name": "Kshitij Raj Sharma",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36752999?v=4",
+      "profile": "https://github.com/kshitijrajsharma",
+      "contributions": ["code"]
+    },
+    {
+      "login": "mahesh-naxa",
+      "name": "Mahesh-wor 'Invoron'",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72002075?v=4",
+      "profile": "https://github.com/mahesh-naxa",
+      "contributions": ["infra"]
+    },
+    {
+      "login": "azharcodeit",
+      "name": "Azhar Ismagulova",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31756707?v=4",
+      "profile": "https://github.com/azharcodeit",
+      "contributions": ["code", "test"]
+    },
+    {
+      "login": "synneolsen",
+      "name": "synneolsen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/107098623?v=4",
+      "profile": "https://github.com/synneolsen",
+      "contributions": ["ideas"]
+    },
+    {
+      "login": "Freedisch",
+      "name": "Freedisch",
+      "avatar_url": "https://avatars.githubusercontent.com/u/82499435?v=4",
+      "profile": "https://github.com/Freedisch",
+      "contributions": ["code"]
+    },
+    {
+      "login": "prasidha1",
+      "name": "prasidha1",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32433336?v=4",
+      "profile": "https://github.com/prasidha1",
+      "contributions": ["code"]
+    },
+    {
+      "login": "iamrajbhattarai",
+      "name": "Raj Bhattarai",
+      "avatar_url": "https://avatars.githubusercontent.com/u/75742784?v=4",
+      "profile": "https://github.com/iamrajbhattarai",
+      "contributions": ["code"]
+    },
+    {
+      "login": "sijandh35",
+      "name": "Sijan Dhungana",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29759582?v=4",
+      "profile": "https://github.com/sijandh35",
+      "contributions": ["code"]
+    },
+    {
+      "login": "khushishikhu",
+      "name": "Khushi Gautam",
+      "avatar_url": "https://avatars.githubusercontent.com/u/65439761?v=4",
+      "profile": "https://github.com/khushishikhu",
+      "contributions": ["doc"]
+    },
+    {
+      "login": "Seckrel",
+      "name": "Aayam Ojha",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43112525?v=4",
+      "profile": "https://github.com/Seckrel",
+      "contributions": ["code"]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/README.md b/README.md
index b85d318c4f..e722cd6759 100644
--- a/README.md
+++ b/README.md
@@ -121,33 +121,47 @@ Thanks goes to these wonderful people:
   <tbody>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="http://ivangayton.net"><img src="https://avatars.githubusercontent.com/u/5991943?v=4?s=100" width="100px;" alt="Ivan Gayton"/><br /><sub><b>Ivan Gayton</b></sub></a><br /><a href="#projectManagement-ivangayton" title="Project Management">📆</a> <a href="https://github.com/hotosm/fmtm/commits?author=ivangayton" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/pulls?q=is%3Apr+reviewed-by%3Aivangayton" title="Reviewed Pull Requests">👀</a> <a href="#ideas-ivangayton" title="Ideas, Planning, & Feedback">🤔</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.hotosm.org"><img src="https://avatars.githubusercontent.com/u/71342768?v=4?s=100" width="100px;" alt="Rob Savoye"/><br /><sub><b>Rob Savoye</b></sub></a><br /><a href="#maintenance-robsavoye" title="Maintenance">🚧</a> <a href="#mentoring-robsavoye" title="Mentoring">🧑‍🏫</a> <a href="https://github.com/hotosm/fmtm/commits?author=robsavoye" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/pulls?q=is%3Apr+reviewed-by%3Arobsavoye" title="Reviewed Pull Requests">👀</a> <a href="#ideas-robsavoye" title="Ideas, Planning, & Feedback">🤔</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/spwoodcock"><img src="https://avatars.githubusercontent.com/u/78538841?v=4?s=100" width="100px;" alt="Sam"/><br /><sub><b>Sam</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=spwoodcock" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/pulls?q=is%3Apr+reviewed-by%3Aspwoodcock" title="Reviewed Pull Requests">👀</a> <a href="#infra-spwoodcock" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-spwoodcock" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-spwoodcock" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/robsavoye"><img src="https://avatars.githubusercontent.com/u/71342768?v=4?s=100" width="100px;" alt="Rob Savoye"/><br /><sub><b>Rob Savoye</b></sub></a><br /><a href="#maintenance-robsavoye" title="Maintenance">🚧</a> <a href="#mentoring-robsavoye" title="Mentoring">🧑‍🏫</a> <a href="https://github.com/hotosm/fmtm/commits?author=robsavoye" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/pulls?q=is%3Apr+reviewed-by%3Arobsavoye" title="Reviewed Pull Requests">👀</a> <a href="#ideas-robsavoye" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ramyaragupathy"><img src="https://avatars.githubusercontent.com/u/12103383?v=4?s=100" width="100px;" alt="Ramya"/><br /><sub><b>Ramya</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/issues?q=author%3Aramyaragupathy" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://spwoodcock.dev"><img src="https://avatars.githubusercontent.com/u/78538841?v=4?s=100" width="100px;" alt="Sam"/><br /><sub><b>Sam</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=spwoodcock" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/pulls?q=is%3Apr+reviewed-by%3Aspwoodcock" title="Reviewed Pull Requests">👀</a> <a href="#infra-spwoodcock" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-spwoodcock" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-spwoodcock" title="Maintenance">🚧</a> <a href="#mentoring-spwoodcock" title="Mentoring">🧑‍🏫</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/susmina94"><img src="https://avatars.githubusercontent.com/u/108750444?v=4?s=100" width="100px;" alt="Susmina_Manandhar"/><br /><sub><b>Susmina_Manandhar</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=susmina94" title="Documentation">📖</a> <a href="#ideas-susmina94" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/hotosm/fmtm/issues?q=author%3Asusmina94" title="Bug reports">🐛</a> <a href="#mentoring-susmina94" title="Mentoring">🧑‍🏫</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/manjitapandey"><img src="https://avatars.githubusercontent.com/u/97273021?v=4?s=100" width="100px;" alt="Manjita Pandey"/><br /><sub><b>Manjita Pandey</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/issues?q=author%3Amanjitapandey" title="Bug reports">🐛</a> <a href="https://github.com/hotosm/fmtm/commits?author=manjitapandey" title="Documentation">📖</a> <a href="#ideas-manjitapandey" title="Ideas, Planning, & Feedback">🤔</a> <a href="#content-manjitapandey" title="Content">🖋</a> <a href="#design-manjitapandey" title="Design">🎨</a> <a href="#projectManagement-manjitapandey" title="Project Management">📆</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Sujanadh"><img src="https://avatars.githubusercontent.com/u/109404840?v=4?s=100" width="100px;" alt="Sujan Adhikari"/><br /><sub><b>Sujan Adhikari</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Sujanadh" title="Code">💻</a> <a href="#maintenance-Sujanadh" title="Maintenance">🚧</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/NSUWAL123"><img src="https://avatars.githubusercontent.com/u/81785002?v=4?s=100" width="100px;" alt="Nishit Suwal"/><br /><sub><b>Nishit Suwal</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=NSUWAL123" title="Code">💻</a> <a href="#maintenance-NSUWAL123" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/varun2948"><img src="https://avatars.githubusercontent.com/u/37866666?v=4?s=100" width="100px;" alt="Deepak Pradhan (Varun)"/><br /><sub><b>Deepak Pradhan (Varun)</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=varun2948" title="Code">💻</a> <a href="#ideas-varun2948" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-varun2948" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nrjadkry"><img src="https://avatars.githubusercontent.com/u/41701707?v=4?s=100" width="100px;" alt="Niraj Adhikari"/><br /><sub><b>Niraj Adhikari</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=nrjadkry" title="Code">💻</a> <a href="#ideas-nrjadkry" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-nrjadkry" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/krtonga"><img src="https://avatars.githubusercontent.com/u/7307817?v=4?s=100" width="100px;" alt="krtonga"/><br /><sub><b>krtonga</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=krtonga" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/commits?author=krtonga" title="Documentation">📖</a> <a href="#tool-krtonga" title="Tools">🔧</a> <a href="#ideas-krtonga" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.hotosm.org/people/petya-kangalova/"><img src="https://avatars.githubusercontent.com/u/98902727?v=4?s=100" width="100px;" alt="Petya "/><br /><sub><b>Petya </b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=petya-kangalova" title="Documentation">📖</a> <a href="#eventOrganizing-petya-kangalova" title="Event Organizing">📋</a> <a href="#ideas-petya-kangalova" title="Ideas, Planning, & Feedback">🤔</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Sujanadh"><img src="https://avatars.githubusercontent.com/u/109404840?v=4?s=100" width="100px;" alt="Sujan Adhikari"/><br /><sub><b>Sujan Adhikari</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Sujanadh" title="Code">💻</a> <a href="#maintenance-Sujanadh" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://zanrevenue.org"><img src="https://avatars.githubusercontent.com/u/52991565?v=4?s=100" width="100px;" alt="Mohamed Bakari Mohamed"/><br /><sub><b>Mohamed Bakari Mohamed</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Mudi-business" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/NSUWAL123"><img src="https://avatars.githubusercontent.com/u/81785002?v=4?s=100" width="100px;" alt="Nishit Suwal"/><br /><sub><b>Nishit Suwal</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=NSUWAL123" title="Code">💻</a> <a href="#maintenance-NSUWAL123" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.scdhub.org"><img src="https://avatars.githubusercontent.com/u/4379874?v=4?s=100" width="100px;" alt="G. Willson"/><br /><sub><b>G. Willson</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=biomassives" title="Code">💻</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/JoltCode"><img src="https://avatars.githubusercontent.com/u/46378904?v=4?s=100" width="100px;" alt="JoltCode"/><br /><sub><b>JoltCode</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=JoltCode" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/neelimagoogly"><img src="https://avatars.githubusercontent.com/u/97789856?v=4?s=100" width="100px;" alt="Neelima Mohanty"/><br /><sub><b>Neelima Mohanty</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=neelimagoogly" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Ndacyayisenga-droid"><img src="https://avatars.githubusercontent.com/u/58124613?v=4?s=100" width="100px;" alt="Tayebwa Noah"/><br /><sub><b>Tayebwa Noah</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Ndacyayisenga-droid" title="Documentation">📖</a></td>
-    </tr>
-    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mohammadareeb95"><img src="https://avatars.githubusercontent.com/u/77102111?v=4?s=100" width="100px;" alt="Mohammad Areeb"/><br /><sub><b>Mohammad Areeb</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=mohammadareeb95" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/AugustHottie"><img src="https://avatars.githubusercontent.com/u/96122635?v=4?s=100" width="100px;" alt="AugustHottie"/><br /><sub><b>AugustHottie</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=AugustHottie" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Balofire"><img src="https://avatars.githubusercontent.com/u/102294666?v=4?s=100" width="100px;" alt="Ahmeed Etti-Balogun"/><br /><sub><b>Ahmeed Etti-Balogun</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Balofire" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Roseford"><img src="https://avatars.githubusercontent.com/u/75838716?v=4?s=100" width="100px;" alt="Uju"/><br /><sub><b>Uju</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Roseford" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://www.el-cordovez.com"><img src="https://avatars.githubusercontent.com/u/75356640?v=4?s=100" width="100px;" alt="JC CorMan"/><br /><sub><b>JC CorMan</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=cordovez" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Prajwalism"><img src="https://avatars.githubusercontent.com/u/123072058?v=4?s=100" width="100px;" alt="Prajwal Khadgi"/><br /><sub><b>Prajwal Khadgi</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Prajwalism" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/manjitapandey"><img src="https://avatars.githubusercontent.com/u/97273021?v=4?s=100" width="100px;" alt="Manjita Pandey"/><br /><sub><b>Manjita Pandey</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/issues?q=author%3Amanjitapandey" title="Bug reports">🐛</a> <a href="https://github.com/hotosm/fmtm/commits?author=manjitapandey" title="Documentation">📖</a> <a href="#ideas-manjitapandey" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/shushila21"><img src="https://avatars.githubusercontent.com/u/77854807?v=4?s=100" width="100px;" alt="shushila21"/><br /><sub><b>shushila21</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=shushila21" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kshitijrajsharma"><img src="https://avatars.githubusercontent.com/u/36752999?v=4?s=100" width="100px;" alt="Kshitij Raj Sharma"/><br /><sub><b>Kshitij Raj Sharma</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=kshitijrajsharma" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mahesh-naxa"><img src="https://avatars.githubusercontent.com/u/72002075?v=4?s=100" width="100px;" alt="Mahesh-wor 'Invoron'"/><br /><sub><b>Mahesh-wor 'Invoron'</b></sub></a><br /><a href="#infra-mahesh-naxa" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/azharcodeit"><img src="https://avatars.githubusercontent.com/u/31756707?v=4?s=100" width="100px;" alt="Azhar Ismagulova"/><br /><sub><b>Azhar Ismagulova</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=azharcodeit" title="Code">💻</a> <a href="https://github.com/hotosm/fmtm/commits?author=azharcodeit" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/synneolsen"><img src="https://avatars.githubusercontent.com/u/107098623?v=4?s=100" width="100px;" alt="synneolsen"/><br /><sub><b>synneolsen</b></sub></a><br /><a href="#ideas-synneolsen" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/susmina94"><img src="https://avatars.githubusercontent.com/u/108750444?v=4?s=100" width="100px;" alt="Susmina_Manandhar"/><br /><sub><b>Susmina_Manandhar</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=susmina94" title="Documentation">📖</a> <a href="#ideas-susmina94" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/hotosm/fmtm/issues?q=author%3Asusmina94" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Freedisch"><img src="https://avatars.githubusercontent.com/u/82499435?v=4?s=100" width="100px;" alt="Freedisch"/><br /><sub><b>Freedisch</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Freedisch" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/prasidha1"><img src="https://avatars.githubusercontent.com/u/32433336?v=4?s=100" width="100px;" alt="prasidha1"/><br /><sub><b>prasidha1</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=prasidha1" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/iamrajbhattarai"><img src="https://avatars.githubusercontent.com/u/75742784?v=4?s=100" width="100px;" alt="Raj Bhattarai"/><br /><sub><b>Raj Bhattarai</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=iamrajbhattarai" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sijandh35"><img src="https://avatars.githubusercontent.com/u/29759582?v=4?s=100" width="100px;" alt="Sijan Dhungana"/><br /><sub><b>Sijan Dhungana</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=sijandh35" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/khushishikhu"><img src="https://avatars.githubusercontent.com/u/65439761?v=4?s=100" width="100px;" alt="Khushi Gautam"/><br /><sub><b>Khushi Gautam</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=khushishikhu" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Seckrel"><img src="https://avatars.githubusercontent.com/u/43112525?v=4?s=100" width="100px;" alt="Aayam Ojha"/><br /><sub><b>Aayam Ojha</b></sub></a><br /><a href="https://github.com/hotosm/fmtm/commits?author=Seckrel" title="Code">💻</a></td>
     </tr>
   </tbody>
   <tfoot>
@@ -160,7 +174,6 @@ Thanks goes to these wonderful people:
     </tr>
   </tfoot>
 </table>
-
 <!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->
 
diff --git a/docs/about/team.md b/docs/about/team.md
index 99e731a269..d15c33ec67 100644
--- a/docs/about/team.md
+++ b/docs/about/team.md
@@ -1,3 +1,7 @@
+<!-- markdownlint-disable -->
+
+<div align="center">
+
 # The FMTM Team
 
 FMTM is developed as a collaboration between HOT's Tech Team &
@@ -5,14 +9,59 @@ FMTM is developed as a collaboration between HOT's Tech Team &
 
 The key staff working on FMTM are listed below:
 
-- Ramya: Product Owner and general product vision.
-- Manjita: Product Manager and development coordination.
-- Sam: Tech Lead for the development team.
-- Sujan: Primary backend developer.
-- Niraj: Backend development advisory role.
-- Nishit: Primary frontend developer.
-- Varun: Frontend development advisory role.
+<div style="margin-bottom: 20px;">
+  <img src="https://avatars.githubusercontent.com/u/12103383?v=4" width="100" style="border-radius: 50%;" alt="Ramya">
+  <br>
+  <b>Ramya</b>
+  <br>
+  <i>Product Owner and general product vision</i>
+</div>
+<div style="margin-bottom: 20px;">
+  <img src="https://avatars.githubusercontent.com/u/97273021?v=4" width="100" style="border-radius: 50%;" alt="Manjita Pandey">
+  <br>
+  <b>Manjita Pandey</b>
+  <br>
+  <i>Product Manager and development coordination</i>
+</div>
+<div style="margin-bottom: 20px;">
+  <img src="https://avatars.githubusercontent.com/u/78538841?v=4" width="100" style="border-radius: 50%;" alt="Sam">
+  <br>
+  <b>Sam</b>
+  <br>
+  <i>Tech Lead for the development team</i>
+</div>
+<div style="margin-bottom: 20px;">
+  <img src="https://avatars.githubusercontent.com/u/109404840?v=4" width="100" style="border-radius: 50%;" alt="Sujan Adhikari">
+  <br>
+  <b>Sujan Adhikari</b>
+  <br>
+  <i>Primary backend developer</i>
+</div>
+<div style="margin-bottom: 20px;">
+  <img src="https://avatars.githubusercontent.com/u/41701707?v=4" width="100" style="border-radius: 50%;" alt="Niraj Adhikari">
+  <br>
+  <b>Niraj Adhikari</b>
+  <br>
+  <i>Backend development advisory role</i>
+</div>
+<div style="margin-bottom: 20px;">
+  <img src="https://avatars.githubusercontent.com/u/81785002?v=4" width="100" style="border-radius: 50%;" alt="Nishit Suwal">
+  <br>
+  <b>Nishit Suwal</b>
+  <br>
+  <i>Primary frontend developer</i>
+</div>
+<div style="margin-bottom: 20px;">
+  <img src="https://avatars.githubusercontent.com/u/37866666?v=4" width="100" style="border-radius: 50%;" alt="Deepak Pradhan (Varun)">
+  <br>
+  <b>Deepak Pradhan (Varun)</b>
+  <br>
+  <i>Frontend development advisory role</i>
+</div>
 
 To see a list of all our contributors and their roles, please see our
 [Contributors](https://github.com/hotosm/fmtm?tab=readme-ov-file#contributors-)
 list in the README.md file.
+
+</div>
+<!-- markdownlint-restore -->