diff --git a/docs/faq/index.md b/docs/faq/index.md
new file mode 100644
index 0000000000..93e3e90fbe
--- /dev/null
+++ b/docs/faq/index.md
@@ -0,0 +1,15 @@
+---
+id: index
+title: Overview
+description: FAQ Overview
+---
+
+This section contains answers to frequently asked questions about Backstage.
+
+### [Product FAQ](../faq/product.md)
+
+Questions related to product and design.
+
+### [Technical FAQ](../faq/technical.md)
+
+General technical questions about Backstage.
diff --git a/docs/faq/product-faq.md b/docs/faq/product.md
similarity index 97%
rename from docs/faq/product-faq.md
rename to docs/faq/product.md
index 29cd22992b..6d97206907 100644
--- a/docs/faq/product-faq.md
+++ b/docs/faq/product.md
@@ -1,7 +1,7 @@
 ---
-id: Product FAQs
-title: Product FAQs
-description: All FAQs related to Product
+id: product
+title: Product FAQ
+description: Product FAQ
 ---
 
 ### Can we call Backstage something different? So that it fits our company better?
diff --git a/docs/faq/technical.md b/docs/faq/technical.md
index 1573c14c59..140b4c0893 100644
--- a/docs/faq/technical.md
+++ b/docs/faq/technical.md
@@ -1,7 +1,7 @@
 ---
-id: Technical FAQs
-title: Technical FAQs
-description: All FAQs related to Technical
+id: technical
+title: Technical FAQ
+description: Technical FAQ
 ---
 
 ### What technology does Backstage use?
diff --git a/microsite/sidebars.json b/microsite/sidebars.json
index 8272f5edfb..f0f924411b 100644
--- a/microsite/sidebars.json
+++ b/microsite/sidebars.json
@@ -472,7 +472,7 @@
       "architecture-decisions/adrs-adr012",
       "architecture-decisions/adrs-adr013"
     ],
-    "FAQ": ["faq/Product FAQs", "faq/Technical FAQs"],
+    "FAQ": ["faq/index", "faq/product", "faq/technical"],
     "Accessibility": ["accessibility/index"]
   }
 }