diff --git a/docs/roadmap.md b/docs/roadmap.md
new file mode 100644
index 0000000000000000000000000000000000000000..d1773ced45de4d1d81d9dc50bfb320cab8cac09c
--- /dev/null
+++ b/docs/roadmap.md
@@ -0,0 +1,17 @@
+# 🚧 Roadmap
+
+## Event Log
+
+TBD
+
+## Callbacks
+
+TBD
+
+## Rückkanal
+
+TBD
+
+## Verschiedene Umgebungen
+
+TBD
diff --git a/docusaurus.config.js b/docusaurus.config.js
index 6fe3f72fa66e67e72c9baf955e3961c768ed3e6a..b8c4d4e1f5d5bd83f8b5bf19ae39e3a6724d12c3 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -1,5 +1,5 @@
 /** @type {import('@docusaurus/types').DocusaurusConfig} */
-const baseUrl = process.env.GIT_BRANCH || '/'
+const baseUrl = `${process.env.GIT_BRANCH}/` || '/'
 const gitBranch = process.env.GIT_BRANCH || 'main'
 
 module.exports = {
diff --git a/sidebars.js b/sidebars.js
index 2363eb693b05b006cdae3afe87b08cde335df44d..3ba071dee24c70a4933f39bca703bef1474ae432 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -11,34 +11,39 @@
 
 module.exports = {
   defaultSidebar: [
-    "overview",
-    "status-and-error-codes",
+    'overview',
+    'roadmap',
+    'account',
+    'status-and-error-codes',
     {
-      type: "category",
-      label: "Getting Started",
+      type: 'link',
+      label: 'Terms of Service',
+      href: 'https://www.fitko.de/',
+    },
+    {
+      type: 'category',
+      label: 'Getting Started',
       items: [
-        "getting-started/overview",
-        "getting-started/account",
-        "getting-started/authentication/applications",
-        "getting-started/authentication/users",
-        "getting-started/encryption",
+        'getting-started/overview',
+        'getting-started/authentication',
+        'getting-started/encryption',
         {
-          type: "category",
-          label: "Versenden",
+          type: 'category',
+          label: 'Versenden',
           items: [
             {
-              type: "autogenerated",
-              dirName: "getting-started/sending",
+              type: 'autogenerated',
+              dirName: 'getting-started/sending',
             },
           ],
         },
         {
-          type: "category",
-          label: "Empfangen",
+          type: 'category',
+          label: 'Empfangen',
           items: [
             {
-              type: "autogenerated",
-              dirName: "getting-started/receiving",
+              type: 'autogenerated',
+              dirName: 'getting-started/receiving',
             },
           ],
         },
@@ -53,48 +58,56 @@ module.exports = {
     //   }]
     // },
     {
-      type: "category",
-      label: "API Spezifikationen",
+      type: 'category',
+      label: 'Spezifikationen/Schemata',
       items: [
         // {
         //   type: "autogenerated",
         //   dirName: "apis",
         // },
         {
-          type: "doc",
-          label: "Antragsmetadaten",
-          id: "apis/application-metadata",
+          type: 'doc',
+          label: 'Antragsmetadaten',
+          id: 'apis/application-metadata',
         },
         {
-          type: "doc",
-          label: "Zustelldienst",
-          id: "apis/delivery-service",
+          type: 'doc',
+          label: 'Zustelldienst',
+          id: 'apis/delivery-service',
         },
       ],
     },
     {
-      type: "category",
-      label: "Weiteres",
+      type: 'category',
+      label: 'Detailinformationen',
       items: [
+        'details/encryption',
         {
-          type: "doc",
-          label: "Glossar",
-          id: "more/glossary",
-        },
-        {
-          type: "link",
-          label: "Feedback",
-          href: "https://jira.fiep-poc.de/servicedesk/customer/portal/1",
+          type: 'category',
+          label: 'Authentifizierung',
+          items: [
+            {
+              type: 'autogenerated',
+              dirName: 'details/authentication',
+            },
+          ],
         },
+      ],
+    },
+    {
+      type: 'category',
+      label: 'Weiteres',
+      items: [
+        'more/glossary',
         {
-          type: "link",
-          label: "Terms of Service",
-          href: "https://www.fitko.de/",
+          type: 'link',
+          label: 'Feedback',
+          href: 'https://jira.fiep-poc.de/servicedesk/customer/portal/1',
         },
         {
-          type: "link",
-          label: "Impressum",
-          href: "https://www.fitko.de/Impressum",
+          type: 'link',
+          label: '✅ Impressum',
+          href: 'https://www.fitko.de/Impressum',
         },
       ],
     },
@@ -104,4 +117,4 @@ module.exports = {
   //   type: 'autogenerated',
   //   dirName: '.', // generate sidebar slice from the docs folder (or versioned_docs/<version>)
   // }],
-};
+}