diff --git a/development/feature-requests-and-bug-reports.mdx b/development/feature-requests-and-bug-reports.mdx
index 4a22b66..d1e9afa 100644
--- a/development/feature-requests-and-bug-reports.mdx
+++ b/development/feature-requests-and-bug-reports.mdx
@@ -7,7 +7,9 @@ We welcome contributions from the community to help improve Pangolin. To ensure
 
 ## Pick the Right Repository
 
-Pangolin is made up of multiple components. To get the fastest response, file your request or bug report in the repository that matches the component you're using.
+Pangolin is made up of multiple components. To get the fastest response, file your request or bug report in the repository that matches what you're using.
+
+### Server Components
 
 <CardGroup cols={2}>
 <Card title="Pangolin" icon="server" href="https://github.com/fosrl/pangolin">
@@ -24,9 +26,33 @@ Pangolin is made up of multiple components. To get the fastest response, file yo
   WireGuard interface management service.
   [Issues](https://github.com/fosrl/gerbil/issues).
 </Card>
+</CardGroup>
+
+### User Clients
+
+<CardGroup cols={2}>
+<Card title="Windows App" icon="desktop" href="https://github.com/fosrl/windows">
+  Pangolin desktop application for Windows.
+  [Issues](https://github.com/fosrl/windows/issues).
+</Card>
+
+<Card title="Android App" icon="desktop" href="https://github.com/fosrl/android">
+  Pangolin mobile application for Android.
+  [Issues](https://github.com/fosrl/android/issues).
+</Card>
+
+<Card title="Apple App" icon="desktop" href="https://github.com/fosrl/apple">
+  Pangolin application for macOS, iOS, and iPadOS.
+  [Issues](https://github.com/fosrl/apple/issues).
+</Card>
+
+<Card title="Unix CLI" icon="desktop" href="https://github.com/fosrl/cli">
+  Pangolin CLI client for Linux and macOS environments.
+  [Issues](https://github.com/fosrl/cli/issues).
+</Card>
 
 <Card title="Olm" icon="desktop" href="https://github.com/fosrl/olm">
-  Client tunnel connector for Newt sites.
+  Low-level client tunnel connector used by clients.
   [Issues](https://github.com/fosrl/olm/issues).
 </Card>
 </CardGroup>
@@ -48,9 +74,18 @@ Feature requests with community support (upvotes and positive feedback) are more
 
 Bug reports should be submitted in GitHub Issues for the relevant repository:
 
+### Server Components
+
 - **Pangolin**: [fosrl/pangolin/issues](https://github.com/fosrl/pangolin/issues)
 - **Newt**: [fosrl/newt/issues](https://github.com/fosrl/newt/issues)
 - **Gerbil**: [fosrl/gerbil/issues](https://github.com/fosrl/gerbil/issues)
+
+### User Clients
+
+- **Windows App**: [fosrl/windows/issues](https://github.com/fosrl/windows/issues)
+- **Android App**: [fosrl/android/issues](https://github.com/fosrl/android/issues)
+- **Apple App**: [fosrl/apple/issues](https://github.com/fosrl/apple/issues)
+- **Unix CLI**: [fosrl/cli/issues](https://github.com/fosrl/cli/issues)
 - **Olm**: [fosrl/olm/issues](https://github.com/fosrl/olm/issues)
 
 Using the correct repo ensures: