diff --git a/.eleventy.js b/.eleventy.js
index 8bfbee3ef..2f5938eeb 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -23,6 +23,9 @@ module.exports = function (eleventyConfig) {
     breaks: true,
     html: true,
   })
+    .use(require("markdown-it-anchor"), {
+      slugify: headerToId,
+    })
     .use(require("markdown-it-mark"))
     .use(require("markdown-it-footnote"))
     .use(function (md) {
@@ -145,22 +148,6 @@ module.exports = function (eleventyConfig) {
 
         return defaultLinkRule(tokens, idx, options, env, self);
       };
-      // Footnote heading fix (till the upstream releases the fix)
-      md.renderer.rules.render_footnote_anchor_name = (
-        tokens,
-        idx,
-        options,
-        env
-      ) => {
-        var n = Number(tokens[idx].meta.id + 1).toString();
-        var prefix = "";
-
-        if (env && typeof env.docId === "string") {
-          prefix = "-" + env.docId + "-";
-        }
-
-        return prefix + n;
-      };
     })
     .use(userMarkdownSetup);
 
diff --git a/package-lock.json b/package-lock.json
index dd547b0c7..551f5bc6a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
                 "gray-matter": "^4.0.3",
                 "lunr": "^2.3.9",
                 "markdown-it": "^13.0.1",
+                "markdown-it-anchor": "^8.6.7",
                 "markdown-it-attrs": "^4.1.6",
                 "markdown-it-footnote": "^3.0.3",
                 "markdown-it-mark": "^3.0.1",
@@ -521,6 +522,28 @@
                 "node": ">=8"
             }
         },
+        "node_modules/@types/linkify-it": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
+            "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
+            "peer": true
+        },
+        "node_modules/@types/markdown-it": {
+            "version": "12.2.3",
+            "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+            "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+            "peer": true,
+            "dependencies": {
+                "@types/linkify-it": "*",
+                "@types/mdurl": "*"
+            }
+        },
+        "node_modules/@types/mdurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
+            "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
+            "peer": true
+        },
         "node_modules/@types/minimatch": {
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
@@ -2959,6 +2982,15 @@
                 "markdown-it": "bin/markdown-it.js"
             }
         },
+        "node_modules/markdown-it-anchor": {
+            "version": "8.6.7",
+            "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz",
+            "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==",
+            "peerDependencies": {
+                "@types/markdown-it": "*",
+                "markdown-it": "*"
+            }
+        },
         "node_modules/markdown-it-attrs": {
             "version": "4.1.6",
             "resolved": "https://registry.npmjs.org/markdown-it-attrs/-/markdown-it-attrs-4.1.6.tgz",
@@ -5826,6 +5858,28 @@
                 }
             }
         },
+        "@types/linkify-it": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
+            "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
+            "peer": true
+        },
+        "@types/markdown-it": {
+            "version": "12.2.3",
+            "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+            "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+            "peer": true,
+            "requires": {
+                "@types/linkify-it": "*",
+                "@types/mdurl": "*"
+            }
+        },
+        "@types/mdurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
+            "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
+            "peer": true
+        },
         "@types/minimatch": {
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
@@ -7697,6 +7751,12 @@
                 }
             }
         },
+        "markdown-it-anchor": {
+            "version": "8.6.7",
+            "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz",
+            "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==",
+            "requires": {}
+        },
         "markdown-it-attrs": {
             "version": "4.1.6",
             "resolved": "https://registry.npmjs.org/markdown-it-attrs/-/markdown-it-attrs-4.1.6.tgz",
diff --git a/package.json b/package.json
index 5e5e4aa84..b76e41c56 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
         "gray-matter": "^4.0.3",
         "lunr": "^2.3.9",
         "markdown-it": "^13.0.1",
+        "markdown-it-anchor": "^8.6.7",
         "markdown-it-attrs": "^4.1.6",
         "markdown-it-footnote": "^3.0.3",
         "markdown-it-mark": "^3.0.1",