diff --git a/development/feature-requests-and-bug-reports.mdx b/development/feature-requests-and-bug-reports.mdx
index a08a32c..b4bb058 100644
--- a/development/feature-requests-and-bug-reports.mdx
+++ b/development/feature-requests-and-bug-reports.mdx
@@ -3,15 +3,52 @@ title: "Feature Requests & Bug Reports"
 description: "How to submit feature requests and report bugs for Pangolin"
 ---
 
-We welcome contributions from the community to help improve Pangolin. To ensure your feedback is properly tracked and prioritized, please use the appropriate GitHub sections for different types of submissions.
+We welcome contributions from the community to help improve Pangolin. To ensure your feedback is properly tracked and prioritized, use the repository that matches the component where your issue or request belongs.
+
+## 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 what you're using.
+
+### Server Components
 
 <CardGroup cols={2}>
-<Card title="Feature Requests" icon="lightbulb">
-  Submit in GitHub Discussions for community feedback and upvoting
+<Card title="Pangolin" icon="server" href="https://github.com/fosrl/pangolin">
+  Dashboard and core platform.
+  [Discussions](https://github.com/fosrl/pangolin/discussions) and [Issues](https://github.com/fosrl/pangolin/issues).
 </Card>
 
-<Card title="Bug Reports" icon="bug">
-  Submit in GitHub Issues for tracking and resolution
+<Card title="Newt" icon="plug" href="https://github.com/fosrl/newt">
+  Site and network connector.
+  [Issues](https://github.com/fosrl/newt/issues).
+</Card>
+
+<Card title="Gerbil" icon="circle-nodes" href="https://github.com/fosrl/gerbil">
+  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 Apps" 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="Pangolin 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>
 </CardGroup>
 
@@ -30,7 +67,23 @@ Feature requests with community support (upvotes and positive feedback) are more
 
 ## Bug Reports
 
-Bug reports should be submitted in the [GitHub Issues section](https://github.com/fosrl/pangolin/issues) for proper tracking and resolution. This ensures:
+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 Apps**: [fosrl/apple/issues](https://github.com/fosrl/apple/issues)
+- **Pangolin 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:
 
 - **Proper tracking** of bugs through their lifecycle
 - **Developer visibility** for quick resolution
@@ -53,7 +106,7 @@ Please provide as much detail as possible to help developers reproduce and fix t
 
 <CardGroup cols={2}>
 <Card title="Security Issues" icon="shield">
-  For security vulnerabilities, please email security@fossorial.com instead of posting publicly.
+  For security vulnerabilities, please email security@pangolin.net instead of posting publicly.
 </Card>
 
 <Card title="General Questions" icon="question">