diff --git a/website/docs/applications.md b/website/docs/core/applications.md
similarity index 98%
rename from website/docs/applications.md
rename to website/docs/core/applications.md
index 7ec5ed07f1..ab6ffec2eb 100644
--- a/website/docs/applications.md
+++ b/website/docs/core/applications.md
@@ -1,5 +1,6 @@
 ---
 title: Applications
+slug: /applications
 ---
 
 Applications in authentik are the counterpart of providers. They exist in a 1-to-1 relationship, each application needs a provider and every provider can be used with one application.
diff --git a/website/docs/tenants.md b/website/docs/core/tenants.md
similarity index 98%
rename from website/docs/tenants.md
rename to website/docs/core/tenants.md
index 5ed91b73d4..2103667333 100644
--- a/website/docs/tenants.md
+++ b/website/docs/core/tenants.md
@@ -1,5 +1,6 @@
 ---
 title: Tenants
+slug: /tenants
 ---
 
 authentik support soft multi-tenancy. This means that you can configure several options depending on domain, but all the objects like applications, providers, etc, are still global. This can be handy to use the same authentik instance, but branded differently for different domains.
diff --git a/website/docs/terminology.md b/website/docs/core/terminology.md
similarity index 99%
rename from website/docs/terminology.md
rename to website/docs/core/terminology.md
index 1b6ea1e424..b8569b8a65 100644
--- a/website/docs/terminology.md
+++ b/website/docs/core/terminology.md
@@ -1,6 +1,7 @@
 ---
 id: terminology
 title: Terminology
+slug: /terminology
 ---
 
 ![](/img/authentik_objects.svg)
diff --git a/website/sidebars.js b/website/sidebars.js
index 610b704384..1fe80b9d74 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -4,10 +4,6 @@ module.exports = {
             type: "doc",
             id: "index",
         },
-        {
-            type: "doc",
-            id: "terminology",
-        },
         {
             type: "category",
             label: "Installation",
@@ -23,8 +19,10 @@ module.exports = {
             ],
         },
         {
-            type: "doc",
-            id: "applications",
+            type: "category",
+            label: "Core Concepts",
+            collapsed: false,
+            items: ["core/terminology", "core/applications", "core/tenants"],
         },
         {
             type: "category",
@@ -121,10 +119,6 @@ module.exports = {
             label: "Users & Groups",
             items: ["user-group/user", "user-group/group"],
         },
-        {
-            type: "doc",
-            id: "tenants",
-        },
         {
             type: "category",
             label: "Maintenance",