diff --git a/.eleventy.js b/.eleventy.js
index 5d785fb..33fc13d 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -1,21 +1,35 @@
 const { EleventyHtmlBasePlugin } = require("@11ty/eleventy");
+const markdownIt = require("markdown-it");
+const markdownItAnchor = require("markdown-it-anchor");
 
 module.exports = function (eleventyConfig) {
+  let markdownItOptions = {
+    html: true, // you can include HTML tags
+  };
+
+  let markdownItAnchorOptions = {
+    level: 2, // minimum level header -- anchors will only be applied to h2 level headers and below but not h1
+    permalink: true,
+  };
   // Copy static assets to output
-  eleventyConfig.setTemplateFormats([ "html", "liquid", "njk", "md" ]);
+  eleventyConfig.setTemplateFormats(["html", "liquid", "njk", "md"]);
   eleventyConfig.addPassthroughCopy("src/css");
   eleventyConfig.addPassthroughCopy("src/js");
   eleventyConfig.addPassthroughCopy("src/image");
   eleventyConfig.addPassthroughCopy("*.pdf");
 
-	eleventyConfig.addPlugin(EleventyHtmlBasePlugin);
+  eleventyConfig.setLibrary(
+    "md",
+    markdownIt(markdownItOptions).use(markdownItAnchor, markdownItAnchorOptions)
+  );
+  eleventyConfig.addPlugin(EleventyHtmlBasePlugin);
 
   return {
     dir: {
       input: "src",
       output: "dist",
       includes: "_includes",
-			layouts: "_layouts",
+      layouts: "_layouts",
     },
     pathPrefix: "/2024/",
   };
diff --git a/package.json b/package.json
index 2c43890..a03afc9 100644
--- a/package.json
+++ b/package.json
@@ -12,5 +12,9 @@
   "license": "ISC",
   "devDependencies": {
     "@11ty/eleventy": "^2.0.1"
+  },
+  "dependencies": {
+    "markdown-it": "^14.1.0",
+    "markdown-it-anchor": "^9.2.0"
   }
 }
diff --git a/src/_pages-content/faq.md b/src/_pages-content/faq.md
index 54f82e3..555126d 100644
--- a/src/_pages-content/faq.md
+++ b/src/_pages-content/faq.md
@@ -22,7 +22,8 @@ Workshops will be 3-hour-long interactive sessions where attendees can learn by
 #### September 23, 2024: Devsprints
 During the Devsprints, people contribute to open-source projects, guided by mentors. This is a nice way to get started with contributing to Python and other open-source projects.
 
-<h3 id="general">General FAQ</h3>
+
+### General FAQ
 
 #### Where can I find updates related to PyCon India 2024?
 All announcements related to the conference are posted to the [PyCon India Announce mailing list](https://mail.python.org/mailman3/lists/inpycon-announce.python.org/). If you would like to volunteer, and contribute to the organization of PyCon India, join the [InPyCon mailing list](https://mail.python.org/mailman/listinfo/inpycon). We also have a presence on social media. All our announcements are posted on our [X](https://x.com/pyconindia), [LinkedIn](https://linkedin.com/company/pyconindia), and [Facebook](https://www.facebook.com/PyConIndia/) pages.
@@ -39,7 +40,7 @@ You can fill out the [volunteer form](https://docs.google.com/forms/d/e/1FAIpQLS
 #### Will the Internet and WiFi setup be good enough for a large crowd? Should I get a data card?
 We try really hard to arrange good Internet at the venue. Most of the time it is adequate. However, the unpredictable amount of usage during the event sometimes causes problems. So it is fine if you don’t carry a data card, but there is no harm in being prepared for the worst.
 
-<h3 id="ticketing">Ticketing FAQ</h3>
+### Ticketing FAQ
 
 #### Ticketing
 Tickets for PyCon India 2024 are available on Konfhub, our Ticketing and Finance Partner. Get your tickets here.
@@ -100,7 +101,7 @@ Yes, there will be a limited number of spot registrations on a first-come-first
 #### Can I switch between workshops during the session?
 No. Each track is planned at its full capacity.
 
-<h3 id="contact-us">Contact Us</h3>
+### Contact Us
 
 - For general queries: [contact@in.pycon.org](mailto:contact@in.pycon.org)
 - For ticket queries: [tickets@in.pycon.org](mailto:tickets@in.pycon.org)
diff --git a/src/css/style.css b/src/css/style.css
index 986c2eb..0d17b36 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -701,7 +701,6 @@ thead th {
   display: flex;
   align-items: center !important;
   justify-content: center;
-  
 }
 .tick-btn {
   padding: 20px 50px;