diff --git a/content/navigation/navigation.md b/content/navigation/navigation.md
index 2b603ac08..9abb88b8a 100644
--- a/content/navigation/navigation.md
+++ b/content/navigation/navigation.md
@@ -146,6 +146,10 @@ navLinks:
         path: https://forum.threefold.io
         external: true
 
+      - title: FAQ
+        path: /faq
+        external: false
+
       - title: Contact Us
         path: "mailto:info@threefold.io"
         external: true
diff --git a/content/page/faq/faq.md b/content/page/faq/faq.md
new file mode 100644
index 000000000..c9f17606e
--- /dev/null
+++ b/content/page/faq/faq.md
@@ -0,0 +1,5 @@
+---
+id: faq
+faqMain: homeFAQ
+faqContent: [q1, q2, q3, q4, q5, q6]
+---
diff --git a/content/page/faq/faq/main/main.md b/content/page/faq/faq/main/main.md
new file mode 100644
index 000000000..ce68a48f5
--- /dev/null
+++ b/content/page/faq/faq/main/main.md
@@ -0,0 +1,4 @@
+---
+id: homeFAQ
+title: Frequently Asked Questions
+---
diff --git a/content/page/home/faq/q1/q1.md b/content/page/faq/faq/q1/q1.md
similarity index 100%
rename from content/page/home/faq/q1/q1.md
rename to content/page/faq/faq/q1/q1.md
diff --git a/content/page/home/faq/q2/q2.md b/content/page/faq/faq/q2/q2.md
similarity index 100%
rename from content/page/home/faq/q2/q2.md
rename to content/page/faq/faq/q2/q2.md
diff --git a/content/page/home/faq/q3/q3.md b/content/page/faq/faq/q3/q3.md
similarity index 100%
rename from content/page/home/faq/q3/q3.md
rename to content/page/faq/faq/q3/q3.md
diff --git a/content/page/home/faq/q4/q4.md b/content/page/faq/faq/q4/q4.md
similarity index 100%
rename from content/page/home/faq/q4/q4.md
rename to content/page/faq/faq/q4/q4.md
diff --git a/content/page/home/faq/q5/q5.md b/content/page/faq/faq/q5/q5.md
similarity index 100%
rename from content/page/home/faq/q5/q5.md
rename to content/page/faq/faq/q5/q5.md
diff --git a/content/page/home/faq/q6/q6.md b/content/page/faq/faq/q6/q6.md
similarity index 100%
rename from content/page/home/faq/q6/q6.md
rename to content/page/faq/faq/q6/q6.md
diff --git a/content/page/home/faq/main/main.md b/content/page/home/faq/main/main.md
deleted file mode 100644
index cdb8d93df..000000000
--- a/content/page/home/faq/main/main.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-id: homeFAQ
-title: Frequently asked questions
----
diff --git a/content/page/home/home.md b/content/page/home/home.md
index 35cc90ef0..7e53d31c3 100644
--- a/content/page/home/home.md
+++ b/content/page/home/home.md
@@ -43,8 +43,6 @@ partenershipsMain: home_partenerships_main
 partnerships: [tag, solidaridad , threefold]
 BlogsMain: blog_main
 blogs: [zero_os_blog, smart_contract_blog, threefold_regenerates]
-faqMain: homeFAQ
-faqContent: [q1, q2, q3, q4, q5, q6]
 ---
 
 <!-- header: home_header
diff --git a/src/pages/Index.vue b/src/pages/Index.vue
index d580d8bd9..eb807b3b7 100644
--- a/src/pages/Index.vue
+++ b/src/pages/Index.vue
@@ -88,11 +88,6 @@
         :news="$page.markdownPage.inTheNews"
       />
 
-      <CenteredAccordion
-        v-if="$page.markdownPage.faqContent"
-        :main="$page.markdownPage.faqMain"
-        :faqs="$page.markdownPage.faqContent"
-      />
       <!-- <SignUp
       v-if="$page.markdownPage.signup"
       :signup="$page.markdownPage.signup"
@@ -357,15 +352,6 @@
           btn3
           image
         }
-        faqMain{
-          id
-          title
-        }
-        faqContent{
-          id
-          question
-          content
-        }
     }  
   }
 
@@ -397,7 +383,6 @@ import InTheNews from "~/components/marketing/sections/logo-clouds/off_white_gri
 import SignUp from "~/components/custom/sections/SignUp.vue";
 import VideoPanel from "~/components/custom/VideoPanel.vue";
 import Partenerships from "~/components/marketing/sections/team-sections/grid_with_large_round_images.vue";
-import CenteredAccordion from "~/components/marketing/sections/faq-sections/CenteredAccordion.vue";
 
 export default {
   components: {
@@ -419,7 +404,6 @@ export default {
     Blogs,
     VideoPanel,
     Partenerships,
-    CenteredAccordion,
   },
   computed: {
     getImg() {
diff --git a/src/templates/MarkdownPage.vue b/src/templates/MarkdownPage.vue
index 990935ecb..b820a20db 100644
--- a/src/templates/MarkdownPage.vue
+++ b/src/templates/MarkdownPage.vue
@@ -30,7 +30,7 @@
         "
         :main="$page.markdownPage.comparisonMain"
         :sections="$page.markdownPage.comparisonSecs"
-      /> -->
+      /> --> 
 
       <TFTFuel
         v-if="
@@ -86,6 +86,12 @@
         :partnerships="$page.markdownPage.partnerships"
       />
 
+      <CenteredAccordion
+        v-if="$page.markdownPage.faqContent"
+        :main="$page.markdownPage.faqMain"
+        :faqs="$page.markdownPage.faqContent"
+      />
+
       <CallToAction
       class="mt-20"
         :id="$page.markdownPage.id"
@@ -216,6 +222,15 @@
          img
          content
        }
+      faqMain{
+          id
+          title
+      }
+      faqContent{
+          id
+          question
+          content
+      }
     }
   }
 
@@ -241,6 +256,7 @@ import WithComparisonTable from "~/components/marketing/sections/pricing/with_co
 import BrandPanel from "~/components/marketing/sections/cta-sections/BrandPanel.vue";
 import AppListItem from "~/components/AppListItem.vue";
 import Partenerships from "~/components/marketing/sections/team-sections/grid_with_large_round_images.vue";
+import CenteredAccordion from "~/components/marketing/sections/faq-sections/CenteredAccordion.vue";
 
 export default {
   components: {
@@ -263,6 +279,7 @@ export default {
     BrandPanel,
     AppListItem,
     Partenerships,
+    CenteredAccordion,
   },
   computed: {
     getImg() {