diff --git a/docs/About.md b/docs/about/about.md
similarity index 100%
rename from docs/About.md
rename to docs/about/about.md
diff --git a/docs/FAQ.md b/docs/about/faq.md
similarity index 100%
rename from docs/FAQ.md
rename to docs/about/faq.md
diff --git a/docs/about/team.md b/docs/about/team.md
new file mode 100644
index 0000000000..99e731a269
--- /dev/null
+++ b/docs/about/team.md
@@ -0,0 +1,18 @@
+# The FMTM Team
+
+FMTM is developed as a collaboration between HOT's Tech Team &
+[NAXA](https://naxa.com.np).
+
+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.
+
+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.
diff --git a/docs/dev/Setup.md b/docs/dev/Setup.md
index d5295f6da5..be1f0829fb 100644
--- a/docs/dev/Setup.md
+++ b/docs/dev/Setup.md
@@ -122,8 +122,9 @@ project then follow the steps below:
 If you encounter any issues or need assistance while using FMTM, you can access
 the following resources:
 
-- Check the [FAQs](https://docs.fmtm.dev/FAQ/) .
-- Ask your doubts in the [Slack channel: #fmtm-field-pilots](https://hotosm.slack.com/archives/C04PCBFDEGN)
+- Check the [FAQs](https://docs.fmtm.dev/faq/) .
+- Ask your doubts in the
+  [Slack channel: #field-mapping-tasking-manager](https://hotosm.slack.com/archives/C04PCBFDEGN)
 
 ### Thank you
 
diff --git a/docs/manuals/project-managers.md b/docs/manuals/project-managers.md
index 5e2244a2cf..0e3a3885c5 100644
--- a/docs/manuals/project-managers.md
+++ b/docs/manuals/project-managers.md
@@ -263,7 +263,7 @@ If you encounter any issues or need assistance while using FMTM, you can access
 the following resources:
 
 - Check the [FAQs][21] .
-- Ask your doubts in the [Slack channel: #fmtm-field-pilots][22]
+- Ask your doubts in the [Slack channel: #field-mapping-tasking-manager][22]
 
 ## Thank you
 
@@ -310,5 +310,5 @@ The FMTM Team
 [18]: https://github.com/hotosm/fmtm/assets/97789856/f9a4bed7-d1a9-44dd-b2d4-b55f428f9416 "project creation status"
 [19]: https://github.com/hotosm/fmtm/assets/97789856/162af2e0-dbfa-4787-8037-f03e71417df8 "select task"
 [20]: https://github.com/hotosm/fmtm/assets/97789856/2c0397b0-1829-420a-982e-3d971b514f2c "map legend"
-[21]: https://docs.fmtm.dev/FAQ "FAQs"
-[22]: https://hotosm.slack.com/archives/C04PCBFDEGN "Slack channel: #fmtm-field-pilots"
+[21]: https://docs.fmtm.dev/faq "FAQs"
+[22]: https://hotosm.slack.com/archives/C04PCBFDEGN "Slack channel: #field-mapping-tasking-manager"
diff --git a/mkdocs.yml b/mkdocs.yml
index 38c8697f7d..57cd7e0242 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -66,11 +66,12 @@ plugins:
 nav:
   - Home: index.md
   - Get Started:
-      - About: About.md
+      - About: about/about.md
       - Installation: INSTALL.md
       - Contribution Guidelines: CONTRIBUTING.md
       - Code of Conduct: https://docs.hotosm.org/code-of-conduct
-      - FAQ: FAQ.md
+      - FAQ: about/faq.md
+      - The Team: about/team.md
   - User Manuals:
       - Video Guides: manuals/videos.md
       - User Types Explanation: user-breakdown.md