diff --git a/cleanup-info-mdx.js b/cleanup-info-mdx.js
deleted file mode 100644
index 077333da..00000000
--- a/cleanup-info-mdx.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * This script removes all .info.mdx files that are generated by the OpenAPI plugin
- * Run it after the build with: 'npm run postbuild' or 'node cleanup-info-mdx.js'.
- */
-
-const fs = require('fs');
-const path = require('path');
-const glob = require('glob');
-
-// Find all .info.mdx files in the SDK-OpenAPI directory
-const infoFiles = glob.sync('docs/SDK-OpenAPI/**/*.info.mdx');
-
-console.log(`Found ${infoFiles.length} .info.mdx files to clean up:`);
-
-// Remove each file
-infoFiles.forEach(file => {
-  console.log(`Removing ${file}`);
-  fs.unlinkSync(file);
-});
-
-console.log('Cleanup complete!');
diff --git a/package.json b/package.json
index dd9d20e8..0a73ffa0 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,6 @@
     "docusaurus": "docusaurus",
     "start": "docusaurus start",
     "build": "docusaurus build",
-    "postbuild": "node cleanup-info-mdx.js",
     "swizzle": "docusaurus swizzle",
     "deploy": "docusaurus deploy",
     "clear": "docusaurus clear",
diff --git a/preprocessing.ts b/preprocessing.ts
index 27999807..f2305dfa 100644
--- a/preprocessing.ts
+++ b/preprocessing.ts
@@ -31,7 +31,7 @@ let openApiSpecsArray: ApiSpecDefinition[] = [
         outputDir: "docs/SDK-OpenAPI/wellknownconfiguration",
         sidebarOptions: {
             groupPathsBy: "tag",
-            categoryLinkSource: "tag",
+            categoryLinkSource: "info",
         },
     },
     {
@@ -41,7 +41,7 @@ let openApiSpecsArray: ApiSpecDefinition[] = [
         // specPathModified is auto-generated if not specified
         sidebarOptions: {
             groupPathsBy: "tag",
-            categoryLinkSource: "tag",
+            categoryLinkSource: "info",
         },
     },
     {
@@ -52,7 +52,7 @@ let openApiSpecsArray: ApiSpecDefinition[] = [
         specPathModified: "./specs-processed/authorization/v2/authorization.openapi.yaml",
         sidebarOptions: {
             groupPathsBy: "tag",
-            categoryLinkSource: "tag",
+            categoryLinkSource: "info",
         },
     },
     {
@@ -61,7 +61,7 @@ let openApiSpecsArray: ApiSpecDefinition[] = [
         outputDir: "docs/SDK-OpenAPI/entityresolution/v1",
         sidebarOptions: {
             groupPathsBy: "tag",
-            categoryLinkSource: "tag",
+            categoryLinkSource: "info",
         },
     },
     {
@@ -70,7 +70,7 @@ let openApiSpecsArray: ApiSpecDefinition[] = [
         outputDir: "docs/SDK-OpenAPI/entityresolution/v2",
         sidebarOptions: {
             groupPathsBy: "tag",
-            categoryLinkSource: "tag",
+            categoryLinkSource: "info",
         },
     },
     {
@@ -79,7 +79,7 @@ let openApiSpecsArray: ApiSpecDefinition[] = [
         outputDir: "docs/SDK-OpenAPI/kas",
         sidebarOptions: {
             groupPathsBy: "tag",
-            categoryLinkSource: "tag",
+            categoryLinkSource: "info",
         },
     },
     // Add more entries here for other OpenAPI specs