diff --git a/app/faqs/FAQsClient.tsx b/app/faqs/FAQsClient.tsx
new file mode 100644
index 0000000000..8a07e6ccd6
--- /dev/null
+++ b/app/faqs/FAQsClient.tsx
@@ -0,0 +1,113 @@
+'use client'
+
+import Button from '@/components/ui/Button'
+import Link from 'next/link'
+import React, { useState } from 'react'
+
+interface FAQ {
+  title: string
+  description: string
+  path: string
+  date: string
+  tags: string[]
+  draft: boolean
+}
+
+interface FAQsClientProps {
+  faqs: FAQ[]
+}
+
+export default function FAQsClient({ faqs }: FAQsClientProps) {
+  const [selectedTags, setSelectedTags] = useState<string[]>([])
+
+  // Get unique tags from all FAQs
+  const allTags = Array.from(
+    new Set(faqs.filter((faq) => !faq.draft).flatMap((faq) => faq.tags || []))
+  ).sort()
+
+  // Filter only by tags
+  const filteredFaqs = faqs
+    .filter((faq) => !faq.draft)
+    .filter(
+      (faq) => selectedTags.length === 0 || selectedTags.some((tag) => faq.tags?.includes(tag))
+    )
+
+  const toggleTag = (tag: string) => {
+    setSelectedTags((prev) => (prev.includes(tag) ? prev.filter((t) => t !== tag) : [...prev, tag]))
+  }
+
+  return (
+    <div className="relative min-h-screen w-full bg-signoz_ink-500">
+      <div className="bg-dot-pattern masked-dots absolute top-0 flex h-full w-full items-center justify-center" />
+      <div className="absolute left-0 right-0 top-0 mx-auto h-[300px] w-full flex-shrink-0 rounded-[956px] bg-gradient-to-b from-[rgba(190,107,241,1)] to-[rgba(69,104,220,0)] bg-[length:110%] bg-no-repeat opacity-30 blur-[300px] sm:h-[450px] sm:bg-[center_-500px] md:h-[956px]" />
+
+      <div className="relative mx-auto flex w-full max-w-7xl flex-col items-center px-4 py-8 sm:px-6 sm:py-12 md:py-24 lg:px-8">
+        <div className="w-full space-y-4 sm:space-y-6">
+          <h1 className="text-center text-2xl font-bold leading-tight tracking-tight text-signoz_vanilla-100 sm:text-3xl md:text-4xl lg:text-5xl">
+            Frequently Asked Questions
+          </h1>
+          <p className="mx-auto max-w-2xl text-center text-base leading-relaxed text-signoz_vanilla-400 sm:text-lg">
+            Find answers to common questions about SigNoz's features, capabilities, and
+            implementation
+          </p>
+          <div className="mx-auto mt-6 w-full max-w-2xl px-4 sm:mt-8">
+            <div className="flex flex-wrap items-center justify-center gap-2">
+              {allTags.map((tag) => (
+                <Button
+                  isButton
+                  key={tag}
+                  onClick={() => toggleTag(tag)}
+                  className={`rounded-full px-2 py-1 text-xs font-medium transition-colors sm:px-3 sm:text-sm ${
+                    selectedTags.includes(tag)
+                      ? 'bg-primary-500 text-signoz_vanilla-100'
+                      : 'bg-signoz_ink-400 text-signoz_vanilla-400 hover:bg-signoz_ink-300'
+                  } border border-signoz_slate-400`}
+                >
+                  {tag}
+                </Button>
+              ))}
+            </div>
+            {selectedTags.length > 0 && (
+              <Button
+                isButton
+                type="button"
+                onClick={() => setSelectedTags([])}
+                variant="link"
+                className="mt-4 w-full justify-center text-xs font-medium text-primary-400 hover:text-primary-300 sm:text-sm"
+              >
+                Clear filters
+              </Button>
+            )}
+          </div>
+        </div>
+
+        <div className="w-full py-8 sm:py-10">
+          <ul className="space-y-4 p-2 sm:space-y-6">
+            {filteredFaqs.map((faq) => (
+              <li key={faq.path}>
+                <Link
+                  href={`/faqs${faq.path}`}
+                  className="block transform rounded-lg border border-signoz_slate-400 bg-signoz_ink-400 p-4 shadow-md transition duration-500 hover:shadow-lg sm:p-6"
+                >
+                  <article>
+                    <div>
+                      <h2 className="mb-2 text-lg font-bold leading-snug tracking-tight text-signoz_vanilla-100 sm:mb-3 sm:text-xl">
+                        {faq.title}
+                      </h2>
+                      <p className="prose mb-3 line-clamp-3 max-w-none text-sm text-signoz_vanilla-400 sm:text-base">
+                        {faq.description}
+                      </p>
+                    </div>
+                    <div className="text-sm font-medium leading-6 text-primary-500 hover:text-primary-400 sm:text-base">
+                      Read more &rarr;
+                    </div>
+                  </article>
+                </Link>
+              </li>
+            ))}
+          </ul>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/app/faqs/[...slug]/page.tsx b/app/faqs/[...slug]/page.tsx
index ed3c195715..72e90a1f13 100644
--- a/app/faqs/[...slug]/page.tsx
+++ b/app/faqs/[...slug]/page.tsx
@@ -1,9 +1,9 @@
 import 'css/prism.css'
+import 'css/tailwind.css'
+import 'css/post.css'
+import 'css/global.css'
+import 'css/doc.css'
 import { components } from '@/components/MDXComponents'
-import { MDXLayoutRenderer } from 'pliny/mdx-components'
-import { sortPosts, coreContent, allCoreContent } from 'pliny/utils/contentlayer'
-import { allFAQs, allAuthors } from 'contentlayer/generated'
-import type { Authors } from 'contentlayer/generated'
 import FAQLayout from '@/layouts/FAQLayout'
 import { Metadata } from 'next'
 import siteMetadata from '@/data/siteMetadata'
@@ -11,84 +11,287 @@ import { notFound } from 'next/navigation'
 import Link from 'next/link'
 import { SidebarIcons } from '@/components/sidebar-icons/icons'
 import Button from '@/components/ui/Button'
+import { fetchMDXContentByPath, MDXContent } from '@/utils/strapi'
+import { generateStructuredData } from '@/utils/structuredData'
+import { CoreContent } from 'pliny/utils/contentlayer'
+import { Blog, Authors } from 'contentlayer/generated'
+import { compileMDX } from 'next-mdx-remote/rsc'
+import readingTime from 'reading-time'
+import GithubSlugger from 'github-slugger'
+import { fromHtmlIsomorphic } from 'hast-util-from-html-isomorphic'
+
+// Remark and rehype plugins
+import remarkGfm from 'remark-gfm'
+import {
+  remarkExtractFrontmatter,
+  remarkCodeTitles,
+  remarkImgToJsx,
+} from 'pliny/mdx-plugins/index.js'
+import rehypeSlug from 'rehype-slug'
+import rehypeAutolinkHeadings from 'rehype-autolink-headings'
+import rehypePrismPlus from 'rehype-prism-plus'
+import remarkMath from 'remark-math'
+
+export const revalidate = 0
+export const dynamicParams = true
+
+// Heroicon mini link for auto-linking headers
+const linkIcon = fromHtmlIsomorphic(
+  `<span class="content-header-link">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" className="w-5 h-5 linkicon">
+      <path d="M12.232 4.232a2.5 2.5 0 0 1 3.536 3.536l-1.225 1.224a.75.75 0 0 0 1.061 1.06l1.224-1.224a4 4 0 0 0-5.656-5.656l-3 3a4 4 0 0 0 .225 5.865.75.75 0 0 0 .977-1.138 2.5 2.5 0 0 1-.142-3.667l3-3Z" />
+      <path d="M11.603 7.963a.75.75 0 0 0-.977 1.138 2.5 2.5 0 0 1 .142 3.667l-3 3a2.5 2.5 0 0 1-3.536-3.536l1.225-1.224a.75.75 0 0 0-1.061-1.06l-1.224 1.224a4 4 0 1 0 5.656 5.656l3-3a4 4 0 0 0-.225-5.865Z" />
+    </svg>
+  </span>`,
+  { fragment: true }
+)
+
+// MDX processing options with all plugins
+const mdxOptions = {
+  mdxOptions: {
+    remarkPlugins: [
+      remarkExtractFrontmatter,
+      remarkGfm,
+      remarkCodeTitles,
+      remarkMath,
+      remarkImgToJsx,
+    ],
+    rehypePlugins: [
+      rehypeSlug,
+      [
+        rehypeAutolinkHeadings,
+        {
+          behavior: 'prepend',
+          headingProperties: {
+            className: ['content-header'],
+          },
+          content: linkIcon,
+        },
+      ],
+      [rehypePrismPlus, { defaultLanguage: 'tsx', ignoreMissing: true }],
+    ],
+  },
+}
+
+// Generate table of contents from MDX content
+function generateTOC(content: string) {
+  const regXHeader = /\n(?<flag>#{1,3})\s+(?<content>.+)/g
+  const slugger = new GithubSlugger()
+
+  // Remove code blocks to avoid parsing headers inside code
+  const regXCodeBlock = /```[\s\S]*?```/g
+  const contentWithoutCodeBlocks = content.replace(regXCodeBlock, '')
+
+  const headings = Array.from(contentWithoutCodeBlocks.matchAll(regXHeader))
+    .map(({ groups }) => {
+      const flag = groups?.flag
+      const content = groups?.content
+      if (!content) return null
+      return {
+        value: content,
+        url: `#${slugger.slug(content)}`,
+        depth: flag?.length == 1 ? 1 : flag?.length == 2 ? 2 : 3,
+      }
+    })
+    .filter((heading): heading is NonNullable<typeof heading> => heading !== null)
+
+  return headings
+}
 
 export async function generateMetadata({
   params,
 }: {
   params: { slug: string[] }
-}): Promise<Metadata | undefined> {
-  const slug = decodeURI(params.slug.join('/'))
-  const post = allFAQs.find((p) => p.slug === slug)
-  const authorList = post?.authors || ['default']
-  const authorDetails = authorList.map((author) => {
-    const authorResults = allAuthors.find((p) => p.slug === author)
-    return coreContent(authorResults as Authors)
-  })
-  if (!post) {
-    return
-  }
+}): Promise<Metadata> {
+  try {
+    // Convert slug array to path
+    const path = params.slug.join('/')
 
-  const publishedAt = new Date(post.date).toISOString()
-  const modifiedAt = new Date(post.lastmod || post.date).toISOString()
-  const authors = authorDetails.map((author) => author.name)
-
-  return {
-    title: post.title,
-    description: post.description,
-    openGraph: {
-      title: post.title,
-      description: post.description,
-      siteName: siteMetadata.title,
-      locale: 'en_US',
-      type: 'article',
-      publishedTime: publishedAt,
-      modifiedTime: modifiedAt,
-      url: './',
-      authors: authors.length > 0 ? authors : [siteMetadata.author],
-    },
-    twitter: {
-      card: 'summary_large_image',
-      title: post.title,
-      description: post.description,
-    },
+    const isProduction = process.env.VERCEL_ENV === 'production'
+
+    try {
+      const deployment_status = isProduction ? 'live' : 'staging'
+      const { data: content } = await fetchMDXContentByPath('faqs', path, deployment_status)
+
+      // Extract author names from the content
+      const authorNames = (content as MDXContent)?.authors?.map((author) => author?.name) || [
+        'SigNoz Team',
+      ]
+
+      return {
+        title: (content as MDXContent).title,
+        description:
+          (content as MDXContent)?.description || `${(content as MDXContent)?.title} - SigNoz FAQ`,
+        authors: authorNames.map((name) => ({ name })),
+        openGraph: {
+          title: (content as MDXContent)?.title,
+          description:
+            (content as MDXContent)?.description ||
+            `${(content as MDXContent)?.title} - SigNoz FAQ`,
+          siteName: siteMetadata.title,
+          locale: 'en_US',
+          type: 'article',
+          publishedTime: (content as MDXContent)?.date,
+          modifiedTime: (content as MDXContent)?.updatedAt,
+          url: (content as MDXContent)?.path || './',
+          authors: authorNames,
+        },
+        twitter: {
+          card: 'summary_large_image',
+          title: (content as MDXContent)?.title,
+          description:
+            (content as MDXContent)?.description ||
+            `${(content as MDXContent)?.title} - SigNoz FAQ`,
+        },
+      }
+    } catch (error) {
+      // Content not found, return 404 metadata
+      return {
+        title: 'Page Not Found',
+        description: 'The requested FAQ page could not be found.',
+        robots: {
+          index: false,
+          follow: false,
+        },
+      }
+    }
+  } catch (error) {
+    console.error('Error generating metadata:', error)
+    return {
+      title: 'Error',
+      description: 'An error occurred while loading the FAQ page.',
+    }
   }
 }
 
-export const generateStaticParams = async () => {
-  const paths = allFAQs.map((p) => ({ slug: p.slug?.split('/') }))
-  return paths
+// Generate static params - returning empty array to generate all pages at runtime
+export async function generateStaticParams() {
+  return []
 }
 
 export default async function Page({ params }: { params: { slug: string[] } }) {
-  const slug = decodeURI(params.slug.join('/'))
-  const sortedCoreContents = allCoreContent(sortPosts(allFAQs))
-  const postIndex = sortedCoreContents.findIndex((p) => p.slug === slug)
-  if (postIndex === -1) {
-    return notFound()
+  if (!params.slug || params.slug.length === 0) {
+    return <div className="min-h-screen">Redirecting to FAQs index...</div>
+  }
+
+  const path = params.slug.join('/')
+
+  const isProduction = process.env.VERCEL_ENV === 'production'
+
+  // Fetch content from Strapi with error handling
+  let content: MDXContent
+  try {
+    if (!process.env.NEXT_PUBLIC_SIGNOZ_CMS_API_URL) {
+      throw new Error('Strapi API URL is not configured')
+    }
+
+    const deployment_status = isProduction ? 'live' : 'staging'
+
+    const response = await fetchMDXContentByPath('faqs', path, deployment_status)
+    if (!response || !response.data) {
+      console.error(`Invalid response for path: ${path}`)
+      notFound()
+    }
+    content = response.data as MDXContent
+  } catch (error) {
+    console.error('Error fetching FAQ content:', error)
+    notFound()
   }
 
-  const post = allFAQs.find((p) => p.slug === slug)
-  if (!post) {
-    return notFound()
+  if (!content) {
+    console.log(`No content returned for path: ${path}`)
+    notFound()
   }
 
-  const authorList = post.authors || ['default']
-  const authorDetails = authorList.map((author) => {
-    const authorResults = allAuthors.find((p) => p.slug === author)
-    return coreContent(authorResults as Authors)
-  })
-  const mainContent = coreContent(post as any)
-  const jsonLd = post.structuredData
+  // Generate computed fields
+  const readingTimeData = readingTime(content?.content)
+  const toc = generateTOC(content?.content)
+
+  // Compile MDX content with all plugins
+  let compiledContent
+  try {
+    const { content: mdxContent } = await compileMDX({
+      source: content?.content,
+      components,
+      options: mdxOptions as any,
+    })
+    compiledContent = mdxContent
+  } catch (error) {
+    console.error('Error compiling MDX:', error)
+    notFound()
+  }
+
+  // Generate structured data
+  const structuredData = generateStructuredData('faqs', content)
+
+  // Prepare content for FAQLayout
+  const mainContent: CoreContent<Blog> = {
+    title: content.title,
+    date: content.date,
+    lastmod: content.updatedAt,
+    tags: content.tags?.data?.map((tag) => tag.attributes?.name) || [],
+    draft: content.deployment_status === 'draft',
+    summary: content.description,
+    images: content.images || [],
+    authors: content.authors?.map((author) => author?.name) || [],
+    slug: path,
+    path: content.path || `/faqs/${path}`,
+    type: 'Blog',
+    readingTime: readingTimeData,
+    filePath: `/faqs/${path}`,
+    structuredData: structuredData,
+    toc: toc,
+    relatedArticles:
+      content.related_faqs?.data?.map((faq) => ({
+        title: faq.attributes?.title,
+        slug: faq.attributes?.path,
+        date: faq.attributes?.date,
+      })) || [],
+  }
+
+  // Prepare author details from the authors relation
+  const authorDetails: CoreContent<Authors>[] = content.authors?.data?.map((author) => ({
+    name: author.attributes?.name || 'Unknown Author',
+    avatar: author.attributes?.image_url || '/static/images/signoz-logo.png',
+    occupation: author.attributes?.title || 'Developer Tools',
+    company: 'SigNoz',
+    email: 'team@signoz.io',
+    twitter: 'https://twitter.com/SigNozHQ',
+    linkedin: 'https://www.linkedin.com/company/signoz',
+    github: 'https://github.com/SigNoz/signoz',
+    path: `/authors/${author.attributes?.key || 'default'}`,
+    type: 'Authors',
+    slug: author.attributes?.key || 'default',
+    readingTime: { text: '', minutes: 0, time: 0, words: 0 },
+    filePath: `/data/authors/${author.attributes?.key || 'default'}.mdx`,
+  })) || [
+    {
+      // Fallback author if no authors are found
+      name: 'SigNoz Team',
+      avatar: '/static/images/signoz-logo.png',
+      occupation: 'Developer Tools',
+      company: 'SigNoz',
+      email: 'team@signoz.io',
+      twitter: 'https://twitter.com/SigNozHQ',
+      linkedin: 'https://www.linkedin.com/company/signoz',
+      github: 'https://github.com/SigNoz/signoz',
+      path: '/authors/default',
+      type: 'Authors',
+      slug: 'default',
+      readingTime: { text: '', minutes: 0, time: 0, words: 0 },
+      filePath: '/data/authors/default.mdx',
+    },
+  ]
 
   return (
     <>
       <script
         type="application/ld+json"
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
+        dangerouslySetInnerHTML={{ __html: JSON.stringify(structuredData) }}
       />
 
       <div className="container mx-auto">
-        <Button variant={"ghost"} isButton={true} className="ml-3.5 mt-10 hover:bg-transparent">
+        <Button variant={'ghost'} isButton={true} className="ml-3.5 mt-10 hover:bg-transparent">
           <Link href={`/faqs/`} className="flex items-center">
             <SidebarIcons.ArrowLeft />
             <span className="pl-1.5 text-sm">Back to FAQs</span>
@@ -96,17 +299,23 @@ export default async function Page({ params }: { params: { slug: string[] } }) {
         </Button>
       </div>
 
-      <FAQLayout 
-        content={mainContent} 
-        authorDetails={authorDetails} 
-        authors={post?.authors}
-        toc={post.toc}
+      <FAQLayout
+        content={mainContent}
+        authorDetails={authorDetails}
+        authors={content.authors?.map((author) => author?.name) || []}
+        toc={toc}
+        tags={content.tags?.map((tag) => tag?.value) || []}
+        relatedArticles={
+          content.related_faqs?.map((faq) => ({
+            title: faq?.title,
+            publishedOn: faq?.date,
+            url: `/faqs/${faq?.path}`,
+          })) || []
+        }
       >
-        <MDXLayoutRenderer 
-          code={post.body.code} 
-          components={components} 
-          toc={post.toc}
-        />
+        <div className="prose max-w-none dark:prose-invert prose-headings:scroll-mt-16">
+          {compiledContent}
+        </div>
       </FAQLayout>
     </>
   )
diff --git a/app/faqs/loading.tsx b/app/faqs/loading.tsx
deleted file mode 100644
index 869139f446..0000000000
--- a/app/faqs/loading.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "@/components/GlobalLoader/GlobalLoader"
\ No newline at end of file
diff --git a/app/faqs/page.tsx b/app/faqs/page.tsx
index 93c73151db..6f08a5bd3e 100644
--- a/app/faqs/page.tsx
+++ b/app/faqs/page.tsx
@@ -1,109 +1,44 @@
-'use client'
-
-import Button from '@/components/ui/Button'
-import { allFAQs } from 'contentlayer/generated'
-import Link from 'next/link'
-import React, { useState } from 'react'
-
-export default function FAQsPage() {
-  const [selectedTags, setSelectedTags] = useState<string[]>([])
-
-  // Get unique tags from all FAQs
-  const allTags = Array.from(
-    new Set(
-      allFAQs
-        .filter((faq) => !faq.draft)
-        .flatMap((faq) => faq.tags || [])
-    )
-  ).sort()
-
-  // Filter only by tags
-  const faqs = allFAQs
-    .filter((faq) => !faq.draft)
-    .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime())
-    .filter((faq) => 
-      selectedTags.length === 0 || selectedTags.some(tag => faq.tags?.includes(tag))
-    )
-
-  const toggleTag = (tag: string) => {
-    setSelectedTags(prev =>
-      prev.includes(tag)
-        ? prev.filter(t => t !== tag)
-        : [...prev, tag]
-    )
+import { fetchMDXContentByPath, MDXContentApiResponse } from '@/utils/strapi'
+import { notFound } from 'next/navigation'
+import FAQsClient from './FAQsClient'
+
+export const revalidate = 0
+export const dynamicParams = true
+
+export default async function FAQsPage() {
+  const isProduction = process.env.VERCEL_ENV === 'production'
+  const deploymentStatus = isProduction ? 'live' : 'staging'
+
+  try {
+    // Fetch all FAQs from Strapi
+    const response = (await fetchMDXContentByPath(
+      'faqs',
+      undefined,
+      deploymentStatus,
+      true
+    )) as MDXContentApiResponse
+
+    if (!response || !response.data) {
+      console.error('Invalid response from Strapi')
+      notFound()
+    }
+
+    // Transform the data to match the client component's expected format
+    const faqs = response.data.map((faq) => ({
+      title: faq.title,
+      description: faq.description,
+      path: faq.path,
+      date: faq.date,
+      tags: faq.tags?.map((tag) => tag.value) || [],
+      draft: faq.deployment_status === 'draft',
+    }))
+
+    // Sort by date (since API sorts but we want to ensure client side too)
+    const sortedFaqs = faqs.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime())
+
+    return <FAQsClient faqs={sortedFaqs} />
+  } catch (error) {
+    console.error('Error fetching FAQs:', error)
+    notFound()
   }
-
-  return (
-    <div className="relative min-h-screen w-full bg-signoz_ink-500">
-      <div className="bg-dot-pattern masked-dots absolute top-0 flex h-full w-full items-center justify-center" />
-      <div className="absolute left-0 right-0 top-0 mx-auto h-[300px] sm:h-[450px] w-full flex-shrink-0 rounded-[956px] bg-gradient-to-b from-[rgba(190,107,241,1)] to-[rgba(69,104,220,0)] bg-[length:110%] bg-no-repeat opacity-30 blur-[300px] sm:bg-[center_-500px] md:h-[956px]" />
-
-      <div className="relative mx-auto flex w-full max-w-7xl flex-col items-center px-4 sm:px-6 lg:px-8 py-8 sm:py-12 md:py-24">
-        <div className="w-full space-y-4 sm:space-y-6">
-          <h1 className="text-center text-2xl sm:text-3xl md:text-4xl lg:text-5xl font-bold leading-tight tracking-tight text-signoz_vanilla-100">
-            Frequently Asked Questions
-          </h1>
-          <p className="text-center text-base sm:text-lg leading-relaxed text-signoz_vanilla-400 max-w-2xl mx-auto">
-            Find answers to common questions about SigNoz's features, capabilities, and implementation
-          </p>
-          <div className="mx-auto mt-6 sm:mt-8 w-full max-w-2xl px-4">
-            <div className="flex flex-wrap items-center justify-center gap-2">
-              {allTags.map((tag) => (
-                <Button
-                  isButton
-                  key={tag}
-                  onClick={() => toggleTag(tag as string)}
-                  className={`rounded-full px-2 sm:px-3 py-1 text-xs sm:text-sm font-medium transition-colors ${
-                    selectedTags.includes(tag as string)
-                      ? 'bg-primary-500 text-signoz_vanilla-100'
-                      : 'bg-signoz_ink-400 text-signoz_vanilla-400 hover:bg-signoz_ink-300'
-                  } border border-signoz_slate-400`}
-                >
-                  {tag}
-                </Button>
-              ))}
-            </div>
-            {selectedTags.length > 0 && (
-              <Button
-                isButton
-                type="button"
-                onClick={() => setSelectedTags([])}
-                variant="link"
-                className="mt-4 w-full justify-center text-xs sm:text-sm font-medium text-primary-400 hover:text-primary-300"
-              >
-                Clear filters
-              </Button>
-            )}
-          </div>
-        </div>
-
-        <div className="w-full py-8 sm:py-10">
-          <ul className="space-y-4 p-2 sm:space-y-6">
-            {faqs.map((faq) => (
-              <li key={faq.slug}>
-                <Link
-                  href={`/faqs/${faq.slug}`}
-                  className="block transform rounded-lg border border-signoz_slate-400 bg-signoz_ink-400 p-4 sm:p-6 shadow-md transition duration-500 hover:shadow-lg"
-                >
-                  <article>
-                    <div>
-                      <h2 className="mb-2 sm:mb-3 text-lg sm:text-xl font-bold leading-snug tracking-tight text-signoz_vanilla-100">
-                        {faq.title}
-                      </h2>
-                      <p className="prose mb-3 max-w-none text-sm sm:text-base text-signoz_vanilla-400 line-clamp-3">
-                        {faq.description}
-                      </p>
-                    </div>
-                    <div className="text-sm sm:text-base font-medium leading-6 text-primary-500 hover:text-primary-400">
-                      Read more &rarr;
-                    </div>
-                  </article>
-                </Link>
-              </li>
-            ))}
-          </ul>
-        </div>
-      </div>
-    </div>
-  )
 }
diff --git a/app/sitemap.ts b/app/sitemap.ts
index f431522a32..107d58cfe9 100644
--- a/app/sitemap.ts
+++ b/app/sitemap.ts
@@ -1,6 +1,17 @@
 import { MetadataRoute } from 'next'
-import { allBlogs, allAuthors, allComparisons, allGuides, allOpentelemetries, allDocs, allFAQs } from 'contentlayer/generated'
+import {
+  allBlogs,
+  allAuthors,
+  allComparisons,
+  allGuides,
+  allOpentelemetries,
+  allDocs,
+} from 'contentlayer/generated'
 import siteMetadata from '@/data/siteMetadata'
+import { fetchMDXContentByPath, MDXContentApiResponse } from '@/utils/strapi'
+
+export const dynamic = 'force-dynamic'
+export const revalidate = 60
 
 const mapChangeFrequency = (
   frequency: string
@@ -19,7 +30,7 @@ const mapChangeFrequency = (
   }
 }
 
-export default function sitemap(): MetadataRoute.Sitemap {
+export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   const siteUrl = siteMetadata.siteUrl
 
   const blogRoutes = allBlogs
@@ -68,10 +79,26 @@ export default function sitemap(): MetadataRoute.Sitemap {
       priority: 0.7,
     }))
 
-  const faqRoutes = allFAQs.map((faq) => ({
-    url: `${siteUrl}/${faq.path}/`,
-    lastModified: faq.lastmod || faq.date,
-  }))
+  const isProduction = process.env.VERCEL_ENV === 'production'
+  const deploymentStatus = isProduction ? 'live' : 'staging'
+
+  // Fetch FAQs from Strapi CMS at runtime
+  let faqRoutes: MetadataRoute.Sitemap = []
+  try {
+    const faqsResponse = (await fetchMDXContentByPath(
+      'faqs',
+      undefined,
+      deploymentStatus,
+      true
+    )) as MDXContentApiResponse
+    faqRoutes = faqsResponse.data.map((faq) => ({
+      url: `${siteUrl}/faqs${faq.path}/`,
+      lastModified: faq.date || faq.updatedAt || faq.publishedAt,
+    }))
+  } catch (error) {
+    console.error('Error fetching FAQs for sitemap:', error)
+    // Return empty array if fetching fails
+  }
 
   const routes = [
     '',
@@ -93,5 +120,13 @@ export default function sitemap(): MetadataRoute.Sitemap {
     changeFrequency: mapChangeFrequency('weekly'),
   }))
 
-  return [...routes, ...blogRoutes, ...comparisonRoutes, ...opentelemetryRoutes, ...docRoutes, ...guideRoutes, ...faqRoutes]
-}
\ No newline at end of file
+  return [
+    ...routes,
+    ...blogRoutes,
+    ...comparisonRoutes,
+    ...opentelemetryRoutes,
+    ...docRoutes,
+    ...guideRoutes,
+    ...faqRoutes,
+  ]
+}
diff --git a/contentlayer.config.ts b/contentlayer.config.ts
index 9f469b4a39..7ef12bf1a4 100644
--- a/contentlayer.config.ts
+++ b/contentlayer.config.ts
@@ -528,49 +528,9 @@ export const CaseStudy = defineDocumentType(() => ({
   computedFields,
 }))
 
-export const FAQ = defineDocumentType(() => ({
-  name: 'FAQ',
-  filePathPattern: 'faqs/**/*.mdx',
-  contentType: 'mdx',
-  fields: {
-    title: { type: 'string', required: true },
-    date: { type: 'date', required: true },
-    tags: { type: 'list', of: { type: 'string' }, default: [] },
-    lastmod: { type: 'date' },
-    draft: { type: 'boolean' },
-    summary: { type: 'string' },
-    description: { type: 'string', required: true },
-    slug: { type: 'string', required: true },
-    authors: { type: 'list', of: { type: 'string' }, required: true },
-  },
-  computedFields: {
-    ...computedFields,
-    relatedArticles: {
-      type: 'json',
-      resolve: (doc) => getRelatedArticles(doc, faqsRelatedArticles),
-    },
-    structuredData: {
-      type: 'json',
-      resolve: (doc) => ({
-        '@context': 'https://schema.org',
-        '@type': 'FAQPage',
-        mainEntity: {
-          '@type': 'Question',
-          name: doc.title,
-          acceptedAnswer: {
-            '@type': 'Answer',
-            text: doc.description
-          }
-        },
-        url: `${siteMetadata.siteUrl}/faqs/${doc.slug}`,
-      }),
-    },
-  },
-}))
-
 export default makeSource({
   contentDirPath: 'data',
-  documentTypes: [Blog, Authors, Comparison, Guide, Opentelemetry, Doc, Newsroom, CaseStudy, FAQ],
+  documentTypes: [Blog, Authors, Comparison, Guide, Opentelemetry, Doc, Newsroom, CaseStudy],
   mdx: {
     cwd: process.cwd(),
     remarkPlugins: [
diff --git a/data/faqs/are-there-any-hidden-costs-associated-with-using-signoz.mdx b/data/faqs/are-there-any-hidden-costs-associated-with-using-signoz.mdx
index 837ddea587..e557a29100 100644
--- a/data/faqs/are-there-any-hidden-costs-associated-with-using-signoz.mdx
+++ b/data/faqs/are-there-any-hidden-costs-associated-with-using-signoz.mdx
@@ -1,6 +1,5 @@
 ---
 title: Are there any hidden costs associated with using SigNoz?
-slug: are-there-any-hidden-costs-associated-with-using-signoz
 description: SigNoz offers transparent pricing, and to help you maximize value, here are some key features that allow for cost optimisation.
 date: 2024-11-14
 tags: [performance]
@@ -13,9 +12,9 @@ No, Using SigNoz for observability comes with a straightforward pricing model as
 
 1. **Base Subscription**: SigNoz starts at **$49 per month** for its paid plans, which include essential features like traces, log management, metrics and dashboards.
 2. **Usage-Based Costs**:
-    - **Logs**: $0.3 per GB ingested with a retention period of 15 days.
-    - **Traces**: $0.3 per GB ingested, also with a 15-day retention.
-    - **Metrics**: $0.1 per million samples with a retention of 1 month.
+   - **Logs**: $0.3 per GB ingested with a retention period of 15 days.
+   - **Traces**: $0.3 per GB ingested, also with a 15-day retention.
+   - **Metrics**: $0.1 per million samples with a retention of 1 month.
 
 You can estimate your monthly bill using [SigNoz’s Pricing Calculator](https://signoz.io/pricing/).
 
@@ -28,10 +27,10 @@ You can estimate your monthly bill using [SigNoz’s Pricing Calculator](https:/
 
 ## Comparison with Other Tools
 
-SigNoz is often compared to Datadog, which has a more complex pricing structure that can lead to hidden costs due to its per-host and usage-based billing models. [Datadog's charges can escalate quickly with dynamic scaling and custom metrics](https://signoz.io/blog/datadog-pricing/), making it less predictable than [SigNoz's model](https://signoz.io/blog/pricing-comparison-signoz-vs-datadog-vs-newrelic-vs-grafana/). 
+SigNoz is often compared to Datadog, which has a more complex pricing structure that can lead to hidden costs due to its per-host and usage-based billing models. [Datadog's charges can escalate quickly with dynamic scaling and custom metrics](https://signoz.io/blog/datadog-pricing/), making it less predictable than [SigNoz's model](https://signoz.io/blog/pricing-comparison-signoz-vs-datadog-vs-newrelic-vs-grafana/).
 
 In contrast, SigNoz's open-source version allows users to avoid recurring SaaS fees altogether, making it an attractive option for budget-conscious teams.
 
 You can read more about [SigNoz vs Datadog](https://signoz.io/product-comparison/signoz-vs-datadog).
 
-In summary, while SigNoz offers a relatively clear pricing structure with no hidden fees in its basic offerings, careful management of data ingestion and retention is essential to avoid unexpected costs.
\ No newline at end of file
+In summary, while SigNoz offers a relatively clear pricing structure with no hidden fees in its basic offerings, careful management of data ingestion and retention is essential to avoid unexpected costs.
diff --git a/data/faqs/can-i-integrate-signoz-with-other-tools.mdx b/data/faqs/can-i-integrate-signoz-with-other-tools.mdx
index 40084b9e39..1ac2746811 100644
--- a/data/faqs/can-i-integrate-signoz-with-other-tools.mdx
+++ b/data/faqs/can-i-integrate-signoz-with-other-tools.mdx
@@ -1,10 +1,10 @@
 ---
 title: Can I integrate SigNoz with other tools?
-slug: can-i-integrate-signoz-with-other-tools
 description: Learn how SigNoz integrates with various tools and services through OpenTelemetry, including cloud platforms, databases, and monitoring solutions.
 date: 2024-11-14
 tags: [features]
 authors: [yuvraj]
+related_faqs: ['/who-uses-signoz-in-production']
 ---
 
 Yes, SigNoz integrates seamlessly with a variety of tools and cloud services, primarily using **OpenTelemetry** for data collection and compatibility.
@@ -15,9 +15,9 @@ Yes, SigNoz integrates seamlessly with a variety of tools and cloud services, pr
 2. **Tracetest**: You can connect [SigNoz with Tracetest](https://signoz.io/blog/signoz-tracetest-opentelemetry-native-observability-meets-testing/), a tool that uses observability data for end-to-end testing. Tracetest can utilize the OpenTelemetry Collector to send trace data to both itself and SigNoz, enabling verification of API responses and underlying processes.
 3. **Alerting and Incident Management**: SigNoz supports integration with alerting tools. You can configure alerts to notify incident management systems when critical performance thresholds are crossed.
 4. **Cloud Services (AWS, GCP, Azure)**:
-    - **AWS**: [SigNoz monitors AWS services](https://signoz.io/docs/aws-monitoring/lambda-logs/) like RDS, API Gateway, and Lambda through OpenTelemetry. It can be deployed on AWS EKS using Helm.
-    - **GCP**: [You can monitor GCP services](https://signoz.io/docs/gcp-monitoring/compute-engine/metrics/) like those on GKE with specific configurations in Helm for GCP environments.
-    - **Azure**: [SigNoz supports monitoring Azure services](https://signoz.io/docs/azure-monitoring/az-fns/metrics/) by deploying on AKS with Azure-specific Helm settings.
+   - **AWS**: [SigNoz monitors AWS services](https://signoz.io/docs/aws-monitoring/lambda-logs/) like RDS, API Gateway, and Lambda through OpenTelemetry. It can be deployed on AWS EKS using Helm.
+   - **GCP**: [You can monitor GCP services](https://signoz.io/docs/gcp-monitoring/compute-engine/metrics/) like those on GKE with specific configurations in Helm for GCP environments.
+   - **Azure**: [SigNoz supports monitoring Azure services](https://signoz.io/docs/azure-monitoring/az-fns/metrics/) by deploying on AKS with Azure-specific Helm settings.
 5. **Database Integrations**: [SigNoz integrates with databases](https://signoz.io/docs/integrations/integrations-list/) like Redis, PostgreSQL, MongoDB, and AWS RDS, allowing you to collect and visualize metrics and logs from these sources.
 
 ### Benefits of Integration
@@ -26,4 +26,4 @@ Yes, SigNoz integrates seamlessly with a variety of tools and cloud services, pr
 - **Flexibility**: [SigNoz](https://signoz.io/docs/introduction/) can be deployed as a self-hosted solution (Docker, Kubernetes) or on the cloud, allowing you to choose the setup that suits your needs.
 - **Cost Efficiency**: As an open-source tool, SigNoz offers a budget-friendly alternative to commercial observability solutions without compromising on features.
 
-In summary, SigNoz’s extensive integration capabilities make it a versatile choice for enhancing observability across various platforms and services. For detailed integration options, refer to the [official documentation](https://signoz.io/docs/integrations/integrations-list/).
\ No newline at end of file
+In summary, SigNoz’s extensive integration capabilities make it a versatile choice for enhancing observability across various platforms and services. For detailed integration options, refer to the [official documentation](https://signoz.io/docs/integrations/integrations-list/).
diff --git a/data/faqs/can-signoz-handle-large-scale-production-environments-effectively.mdx b/data/faqs/can-signoz-handle-large-scale-production-environments-effectively.mdx
index cf13603f08..06ec596704 100644
--- a/data/faqs/can-signoz-handle-large-scale-production-environments-effectively.mdx
+++ b/data/faqs/can-signoz-handle-large-scale-production-environments-effectively.mdx
@@ -1,6 +1,5 @@
 ---
 title: Can SigNoz handle large-scale production environments effectively?
-slug: can-signoz-handle-large-scale-production-environments-effectively
 description: SigNoz is an open-source observability platform designed to effectively handle large-scale production environments. Its architecture and features make it suitable for monitoring complex applications and systems, ensuring performance and reliability.
 date: 2024-11-16
 tags: [performance]
@@ -29,4 +28,4 @@ To maximize the effectiveness of [SigNoz in production settings](https://signoz.
 - **Configuration Optimization**: Adjusting configurations such as TTL (time-to-live) for disk storage and using higher batch sizes in the OpenTelemetry collector can enhance performance when dealing with large datasets.
 - **Distributed Tracing**: Implementing distributed tracing capabilities allows teams to monitor requests across microservices effectively, identifying bottlenecks in real-time.
 
-SigNoz is well-equipped to handle large-scale production environments through its scalable architecture, efficient performance metrics, and robust monitoring features. Its ability to integrate various observability signals into a single platform enhances troubleshooting capabilities and operational reliability.
\ No newline at end of file
+SigNoz is well-equipped to handle large-scale production environments through its scalable architecture, efficient performance metrics, and robust monitoring features. Its ability to integrate various observability signals into a single platform enhances troubleshooting capabilities and operational reliability.
diff --git a/data/faqs/does-signoz-work-well-with-existing-prometheus-setups.mdx b/data/faqs/does-signoz-work-well-with-existing-prometheus-setups.mdx
index b57c054022..d05bb34945 100644
--- a/data/faqs/does-signoz-work-well-with-existing-prometheus-setups.mdx
+++ b/data/faqs/does-signoz-work-well-with-existing-prometheus-setups.mdx
@@ -1,6 +1,5 @@
 ---
 title: Does SigNoz work well with existing Prometheus setups?
-slug: does-signoz-work-well-with-existing-prometheus-setups
 description: SigNoz integrates effectively with existing Prometheus setups, facilitating a smooth transition for users looking to enhance their monitoring capabilities. Here are the key aspects of this integration.
 date: 2024-11-14
 tags: [features]
@@ -19,4 +18,4 @@ SigNoz integrates effectively with existing Prometheus setups, facilitating a sm
 - **Unified Observability**: By integrating with SigNoz, users gain access to a comprehensive monitoring platform that combines various telemetry types (metrics, logs, traces) in one interface. This holistic view aids in identifying performance bottlenecks and optimizing resource utilization.
 - **Advanced Alerting**: SigNoz enhances alert management by allowing dynamic configuration through APIs, which provides greater flexibility compared to traditional Prometheus alerting setups.
 
-In summary, SigNoz not only works well with existing Prometheus setups but also enhances them by providing additional features and capabilities that improve overall observability and monitoring efficiency.
\ No newline at end of file
+In summary, SigNoz not only works well with existing Prometheus setups but also enhances them by providing additional features and capabilities that improve overall observability and monitoring efficiency.
diff --git a/data/faqs/how-signoz-ensures-data-security-and-privacy.mdx b/data/faqs/how-signoz-ensures-data-security-and-privacy.mdx
index fda06f6e8a..6de77cb3dd 100644
--- a/data/faqs/how-signoz-ensures-data-security-and-privacy.mdx
+++ b/data/faqs/how-signoz-ensures-data-security-and-privacy.mdx
@@ -1,6 +1,5 @@
 ---
 title: How does SigNoz ensure data security and privacy?
-slug: how-signoz-ensures-data-security-and-privacy
 description: SigNoz takes a comprehensive approach to data security and privacy, implementing various measures and compliance standards to protect user information. Here are the key aspects of how SigNoz ensures data security and privacy.
 date: 2024-11-14
 tags: [features, security]
@@ -29,4 +28,4 @@ authors: [yuvraj]
 - **Regular Audits and Risk Management**: SigNoz undergoes regular audits as part of its SOC 2 compliance, ensuring effective internal controls for data security. This continuous monitoring helps detect and address potential risks.
 - **Transparent Operations**: SigNoz maintains clear, transparent processes for data handling, giving you confidence in its commitment to industry standards.
 
-By adhering to standards like SOC 2 and HIPAA, implementing strong security features, supporting data privacy through PII scrubbing, and focusing on continuous monitoring, SigNoz provides a secure environment for observability data. These practices protect your information while aligning with regulatory needs, making SigNoz a trustworthy choice for data security and privacy.
\ No newline at end of file
+By adhering to standards like SOC 2 and HIPAA, implementing strong security features, supporting data privacy through PII scrubbing, and focusing on continuous monitoring, SigNoz provides a secure environment for observability data. These practices protect your information while aligning with regulatory needs, making SigNoz a trustworthy choice for data security and privacy.
diff --git a/data/faqs/how-signozs-advanced-filtering-and-aggregation-capabilities-improve-root-cause-analysis.mdx b/data/faqs/how-signozs-advanced-filtering-and-aggregation-capabilities-improve-root-cause-analysis.mdx
index 8c4a16058d..e57cf61c74 100644
--- a/data/faqs/how-signozs-advanced-filtering-and-aggregation-capabilities-improve-root-cause-analysis.mdx
+++ b/data/faqs/how-signozs-advanced-filtering-and-aggregation-capabilities-improve-root-cause-analysis.mdx
@@ -1,6 +1,5 @@
 ---
 title: How SigNoz's advanced filtering and aggregation capabilities improve root cause analysis?
-slug: how-signozs-advanced-filtering-and-aggregation-capabilities-improve-root-cause-analysis
 description: SigNoz is an open-source observability platform that helps you perform root cause analysis using advanced filtering and aggregation. With a unified view of metrics, logs, and traces, you can quickly identify and resolve performance issues.
 date: 2024-11-14
 tags: [features]
@@ -35,4 +34,4 @@ SigNoz [correlates metrics, logs, and traces](https://signoz.io/opentelemetry/co
 - When you detect a latency spike, access related logs and traces to determine if the issue is due to a database query or network failure.
 - [Automated anomaly detection](https://signoz.io/blog/introducing-anomaly-detection-for-smarter-alerts/) flags unusual patterns, helping you find root causes faster.
 
-In summary, [SigNoz](https://signoz.io/docs/introduction/)'s filtering, aggregation, and correlation capabilities make root cause analysis more efficient. With detailed queries, efficient data summarization, and seamless correlation, SigNoz helps you resolve issues faster and improve system reliability.
\ No newline at end of file
+In summary, [SigNoz](https://signoz.io/docs/introduction/)'s filtering, aggregation, and correlation capabilities make root cause analysis more efficient. With detailed queries, efficient data summarization, and seamless correlation, SigNoz helps you resolve issues faster and improve system reliability.
diff --git a/data/faqs/how-signozs-columnar-datastore-enhances-query-performance.mdx b/data/faqs/how-signozs-columnar-datastore-enhances-query-performance.mdx
index a8f3aeb7a5..1aef3ed309 100644
--- a/data/faqs/how-signozs-columnar-datastore-enhances-query-performance.mdx
+++ b/data/faqs/how-signozs-columnar-datastore-enhances-query-performance.mdx
@@ -1,6 +1,5 @@
 ---
 title: How SigNoz's columnar datastore enhances query performance?
-slug: how-signozs-columnar-datastore-enhances-query-performance
 description: SigNoz uses a columnar datastore, specifically ClickHouse, to boost query performance for observability tasks. This setup is ideal for managing large amounts of telemetry data, including metrics, traces, and logs.
 date: 2024-11-14
 tags: [features, performance]
@@ -31,4 +30,4 @@ The platform includes a [powerful query builder](https://signoz.io/docs/userguid
 
 ClickHouse also improves storage efficiency with features like data compression and partitioning. This lowers [storage costs](https://signoz.io/pricing/) while maintaining high performance during data ingestion and querying. SigNoz effectively manages long-term storage, meeting compliance and auditing needs without sacrificing speed.
 
-By leveraging ClickHouse, SigNoz transforms how you query and analyze observability data. This architecture ensures rapid aggregation, efficient data handling, and a unified experience—all critical for modern monitoring and troubleshooting. SigNoz stands out as a strong choice for developers looking for fast and efficient insights from their telemetry data.
\ No newline at end of file
+By leveraging ClickHouse, SigNoz transforms how you query and analyze observability data. This architecture ensures rapid aggregation, efficient data handling, and a unified experience—all critical for modern monitoring and troubleshooting. SigNoz stands out as a strong choice for developers looking for fast and efficient insights from their telemetry data.
diff --git a/data/faqs/how-signozs-integration-with-opentelemetry-simplifies-instrumentation.mdx b/data/faqs/how-signozs-integration-with-opentelemetry-simplifies-instrumentation.mdx
index ed972bde16..9514d3ffb6 100644
--- a/data/faqs/how-signozs-integration-with-opentelemetry-simplifies-instrumentation.mdx
+++ b/data/faqs/how-signozs-integration-with-opentelemetry-simplifies-instrumentation.mdx
@@ -1,6 +1,5 @@
 ---
 title: How SigNoz's integration with OpenTelemetry simplifies instrumentation?
-slug: how-signozs-integration-with-opentelemetry-simplifies-instrumentation
 description: SigNoz is an open-source observability platform that helps you monitor and improve application performance. Built to natively support OpenTelemetry, it simplifies instrumentation and provides a unified view of metrics, logs, and traces, helping you identify and resolve issues quickly.
 date: 2024-11-14
 tags: [features]
@@ -33,12 +32,12 @@ You can deploy [SigNoz as a cloud service or self-hos](https://signoz.io/docs/in
 
 ## Key Features of SigNoz with OpenTelemetry
 
-| Feature | Description |
-| --- | --- |
-| **Full-Stack Observability** | Visibility across all layers of the application stack. |
+| Feature                       | Description                                                |
+| ----------------------------- | ---------------------------------------------------------- |
+| **Full-Stack Observability**  | Visibility across all layers of the application stack.     |
 | **Automatic Instrumentation** | Supports automatic instrumentation for multiple languages. |
-| **Multi-Signal Support** | Handles traces, metrics, and logs in one platform. |
-| **Custom Dashboards** | Create dashboards tailored to your needs. |
-| **Community Support** | Backed by a strong, growing community. |
+| **Multi-Signal Support**      | Handles traces, metrics, and logs in one platform.         |
+| **Custom Dashboards**         | Create dashboards tailored to your needs.                  |
+| **Community Support**         | Backed by a strong, growing community.                     |
 
-By integrating SigNoz with OpenTelemetry, you can simplify the instrumentation process, gain rich visualization capabilities, and deploy observability solutions on your terms. This gives you deeper insights into application performance while keeping control over your data.
\ No newline at end of file
+By integrating SigNoz with OpenTelemetry, you can simplify the instrumentation process, gain rich visualization capabilities, and deploy observability solutions on your terms. This gives you deeper insights into application performance while keeping control over your data.
diff --git a/data/faqs/who-uses-signoz-in-production.mdx b/data/faqs/who-uses-signoz-in-production.mdx
index eb3ffd0e13..e3db546487 100644
--- a/data/faqs/who-uses-signoz-in-production.mdx
+++ b/data/faqs/who-uses-signoz-in-production.mdx
@@ -1,6 +1,5 @@
 ---
 title: Who uses SigNoz in production?
-slug: who-uses-signoz-in-production
 description: SigNoz helps organizations of all sizes, from startups to established companies, improve observability and application performance monitoring. Here are some companies using SigNoz and their experiences.
 date: 2024-11-14
 tags: [usecases]
@@ -14,7 +13,7 @@ SigNoz helps organizations of all sizes, from startups to established companies,
 - [**Mailmodo**](https://signoz.io/case-study/mailmodo/): Monitors over 200GB of daily logs from 200+ microservices.
 - [**Kiwi**](https://signoz.io/case-study/kiwi/): Reduced API response times from 20 seconds to milliseconds.
 - [**Brainfish**](https://signoz.io/case-study/brainfish/): Uses SigNoz for monitoring and log management in Kubernetes.
-{/* - [**Bands**](https://signoz.io/case-study/bands/): Monitors over 50 integrations for thousands of musicians. */}
+  {/* - [**Bands**](https://signoz.io/case-study/bands/): Monitors over 50 integrations for thousands of musicians. */}
 - [**Cedana**](https://signoz.io/case-study/cedana/): Ensures uptime for real-time compute operations.
 - [**The Hindu**](https://signoz.io/case-study/thehindu/): Optimizes application performance using SigNoz APM.
 - [**Outplay**](https://signoz.io/case-study/outplay/): Improved backend API response times by 35% with SigNoz.
@@ -24,4 +23,4 @@ Major tech companies like Samsung, Salesforce, and NetApp also use SigNoz's self
 
 ## Community Feedback
 
-Users praise SigNoz for its easy setup and wide range of features. It's especially helpful in Kubernetes environments, where it automatically collects logs and metrics with little configuration. [Read more about users' experiences here.](https://www.reddit.com/r/devops/comments/11n272q/who_uses_signoz_in_production/)
\ No newline at end of file
+Users praise SigNoz for its easy setup and wide range of features. It's especially helpful in Kubernetes environments, where it automatically collects logs and metrics with little configuration. [Read more about users' experiences here.](https://www.reddit.com/r/devops/comments/11n272q/who_uses_signoz_in_production/)
diff --git a/layouts/FAQLayout.tsx b/layouts/FAQLayout.tsx
index 9e357041ff..05fc11939e 100644
--- a/layouts/FAQLayout.tsx
+++ b/layouts/FAQLayout.tsx
@@ -31,10 +31,18 @@ interface LayoutProps {
   children: ReactNode
   toc: tocItemProps[]
   relatedArticles?: RelatedArticleProps[]
+  tags: string[]
 }
 
-export default function FAQLayout({ content, authors, children, toc }: LayoutProps) {
-  const { slug, date, title, tags, readingTime, relatedArticles } = content
+export default function FAQLayout({
+  content,
+  authors,
+  children,
+  toc,
+  tags,
+  relatedArticles,
+}: LayoutProps) {
+  const { slug, date, title, readingTime } = content
   const mainRef = useRef<HTMLElement | null>(null)
   const [isTocVisible, setIsTocVisible] = useState(true)
   const lastScrollY = useRef(0)
@@ -103,7 +111,7 @@ export default function FAQLayout({ content, authors, children, toc }: LayoutPro
               {children}
             </article>
             <div className="my-8">
-              <div className="bg-gradient-to-r from-gray-800 to-gray-900 rounded-xl pt-8 pb-4 px-8 shadow-lg hover:shadow-xl transition-all duration-300 ease-in-out transform hover:-translate-y-1">
+              <div className="transform rounded-xl bg-gradient-to-r from-gray-800 to-gray-900 px-8 pb-4 pt-8 shadow-lg transition-all duration-300 ease-in-out hover:-translate-y-1 hover:shadow-xl">
                 <GetStartedSigNoz />
               </div>
             </div>
@@ -113,8 +121,6 @@ export default function FAQLayout({ content, authors, children, toc }: LayoutPro
           <RelatedArticles relatedArticles={relatedArticles} />
         )}
       </SectionContainer>
-
-      
     </main>
   )
 }
diff --git a/scripts/rss.mjs b/scripts/rss.mjs
index f3bed7e34c..8a4443b170 100644
--- a/scripts/rss.mjs
+++ b/scripts/rss.mjs
@@ -10,8 +10,8 @@ import {
   allComparisons,
   allGuides,
   allOpentelemetries,
-  allFAQs,
 } from '../.contentlayer/generated/index.mjs'
+// TODO: Add FAQs handling to the RSS feed
 import { sortPosts } from 'pliny/utils/contentlayer.js'
 
 const generateRssItem = (config, post) => {
@@ -71,7 +71,7 @@ async function generateRSS(config, allBlogs, page = 'feed.xml') {
 }
 
 const rss = () => {
-  generateRSS(siteMetadata, [...allBlogs, ...allComparisons, ...allGuides, ...allOpentelemetries, ...allDocs, ...allFAQs])
+  generateRSS(siteMetadata, [...allBlogs, ...allComparisons, ...allGuides, ...allOpentelemetries, ...allDocs])
   console.log('RSS feed generated...')
 }
 
diff --git a/utils/strapi.ts b/utils/strapi.ts
index d59e5bc2db..27021400f4 100644
--- a/utils/strapi.ts
+++ b/utils/strapi.ts
@@ -348,15 +348,6 @@ export const fetchMDXContentByPath = async (
 
     const data: MDXContentApiResponse = await response.json()
 
-    if (!fetchAll) {
-      console.log('Data:', data)
-      console.log('Data.data:', data.data)
-      console.log('Data.data.length:', data.data.length)
-      console.log('Query URL:', `${API_URL}/api/${collectionName}${queryParams}`)
-      console.log('Authors in response:', data.data[0]?.attributes?.authors)
-      console.log('Related FAQs in response:', data.data[0]?.attributes?.related_faqs)
-    }
-
     if (!data.data || data.data.length === 0) {
       throw new Error('Content not found')
     }