diff --git a/website/developer-docs/api/api.md b/website/docs/api/api.md
similarity index 100%
rename from website/developer-docs/api/api.md
rename to website/docs/api/api.md
diff --git a/website/developer-docs/api/browser.mdx b/website/docs/api/browser.mdx
similarity index 100%
rename from website/developer-docs/api/browser.mdx
rename to website/docs/api/browser.mdx
diff --git a/website/developer-docs/api/flow-executor.md b/website/docs/api/flow-executor.md
similarity index 100%
rename from website/developer-docs/api/flow-executor.md
rename to website/docs/api/flow-executor.md
diff --git a/website/developer-docs/api/making-schema-changes.md b/website/docs/api/making-schema-changes.md
similarity index 100%
rename from website/developer-docs/api/making-schema-changes.md
rename to website/docs/api/making-schema-changes.md
diff --git a/website/developer-docs/api/websocket.md b/website/docs/api/websocket.md
similarity index 100%
rename from website/developer-docs/api/websocket.md
rename to website/docs/api/websocket.md
diff --git a/website/developer-docs/blueprints/export.md b/website/docs/blueprints/export.md
similarity index 100%
rename from website/developer-docs/blueprints/export.md
rename to website/docs/blueprints/export.md
diff --git a/website/developer-docs/blueprints/index.md b/website/docs/blueprints/index.md
similarity index 100%
rename from website/developer-docs/blueprints/index.md
rename to website/docs/blueprints/index.md
diff --git a/website/developer-docs/blueprints/v1/example.md b/website/docs/blueprints/v1/example.md
similarity index 100%
rename from website/developer-docs/blueprints/v1/example.md
rename to website/docs/blueprints/v1/example.md
diff --git a/website/developer-docs/blueprints/v1/meta.md b/website/docs/blueprints/v1/meta.md
similarity index 100%
rename from website/developer-docs/blueprints/v1/meta.md
rename to website/docs/blueprints/v1/meta.md
diff --git a/website/developer-docs/blueprints/v1/models.md b/website/docs/blueprints/v1/models.md
similarity index 100%
rename from website/developer-docs/blueprints/v1/models.md
rename to website/docs/blueprints/v1/models.md
diff --git a/website/developer-docs/blueprints/v1/structure.md b/website/docs/blueprints/v1/structure.md
similarity index 100%
rename from website/developer-docs/blueprints/v1/structure.md
rename to website/docs/blueprints/v1/structure.md
diff --git a/website/developer-docs/blueprints/v1/tags.md b/website/docs/blueprints/v1/tags.md
similarity index 100%
rename from website/developer-docs/blueprints/v1/tags.md
rename to website/docs/blueprints/v1/tags.md
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 1392316d2..525e2346c 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -35,11 +35,6 @@ module.exports = async function () {
                         label: "Integrations",
                         position: "left",
                     },
-                    {
-                        to: "developer-docs/",
-                        label: "Developer",
-                        position: "left",
-                    },
                     {
                         to: "pricing/",
                         label: "Pricing",
diff --git a/website/docusaurus.docs-only.js b/website/docusaurus.docs-only.js
index 08db9c3c5..0d5443fdc 100644
--- a/website/docusaurus.docs-only.js
+++ b/website/docusaurus.docs-only.js
@@ -32,12 +32,6 @@ module.exports = async function () {
                         label: "Integrations",
                         position: "left",
                     },
-                    {
-                        to: "developer-docs/",
-                        activeBasePath: "developer-docs",
-                        label: "Developer Docs",
-                        position: "left",
-                    },
                     {
                         href: "https://github.com/goauthentik/authentik",
                         label: "GitHub",
diff --git a/website/netlify.toml b/website/netlify.toml
index bf3fd1a38..af41efc0c 100644
--- a/website/netlify.toml
+++ b/website/netlify.toml
@@ -29,6 +29,14 @@
   status = 301
   force = true
 
+# Migrate API and blueprints into main docs
+[[redirects]]
+  from = "/developer-docs/api*"
+  to = "/docs/api:splat"
+[[redirects]]
+  from = "/developer-docs/blueprints*"
+  to = "/docs/blueprints:splat"
+
 # Container registry
 [[redirects]]
   from = "/v2"
diff --git a/website/sidebars.js b/website/sidebars.js
index 6b8a56bdf..81145d7dc 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -262,6 +262,43 @@ const docsSidebar = {
             label: "Users & Groups",
             items: ["user-group/user", "user-group/group"],
         },
+        {
+            type: "category",
+            label: "Blueprints",
+            link: {
+                type: "doc",
+                id: "blueprints/index",
+            },
+            items: [
+                "blueprints/export",
+                "blueprints/v1/structure",
+                "blueprints/v1/tags",
+                "blueprints/v1/example",
+                {
+                    type: "category",
+                    label: "Models",
+                    link: {
+                        type: "doc",
+                        id: "blueprints/v1/models",
+                    },
+                    items: ["blueprints/v1/meta"],
+                },
+            ],
+        },
+        {
+            type: "category",
+            label: "API",
+            link: {
+                type: "doc",
+                id: "api/api",
+            },
+            items: [
+                "api/flow-executor",
+                "api/making-schema-changes",
+                "api/websocket",
+                "api/browser",
+            ],
+        },
         {
             type: "category",
             label: "Release Notes",
diff --git a/website/sidebarsDev.js b/website/sidebarsDev.js
index a5043d56b..00b62918a 100644
--- a/website/sidebarsDev.js
+++ b/website/sidebarsDev.js
@@ -12,43 +12,6 @@ module.exports = {
             type: "doc",
             id: "index",
         },
-        {
-            type: "category",
-            label: "Blueprints",
-            link: {
-                type: "doc",
-                id: "blueprints/index",
-            },
-            items: [
-                "blueprints/export",
-                "blueprints/v1/structure",
-                "blueprints/v1/tags",
-                "blueprints/v1/example",
-                {
-                    type: "category",
-                    label: "Models",
-                    link: {
-                        type: "doc",
-                        id: "blueprints/v1/models",
-                    },
-                    items: ["blueprints/v1/meta"],
-                },
-            ],
-        },
-        {
-            type: "category",
-            label: "API",
-            link: {
-                type: "doc",
-                id: "api/api",
-            },
-            items: [
-                "api/flow-executor",
-                "api/making-schema-changes",
-                "api/websocket",
-                "api/browser",
-            ],
-        },
         {
             type: "category",
             label: "Setup",