diff --git a/frontend/src/components/BlockPickerOverlay.vue b/frontend/src/components/BlockPickerOverlay.vue
index 5d7f9fe87..340be1613 100644
--- a/frontend/src/components/BlockPickerOverlay.vue
+++ b/frontend/src/components/BlockPickerOverlay.vue
@@ -11,7 +11,7 @@
         color="white"
         :aria-label="t(`common.actions.viewDocs`)"
         icon="la:question-circle"
-        :href="siteStore.docsBase + `/editor/markdown`"
+        :href="siteStore.docsBase + `/guide/blocks`"
         target="_blank"
         type="a" />
       <w-btn-group push>
diff --git a/frontend/src/components/EditorMarkdownUserSettingsOverlay.vue b/frontend/src/components/EditorMarkdownUserSettingsOverlay.vue
index 8b548a243..eb83f0bb8 100644
--- a/frontend/src/components/EditorMarkdownUserSettingsOverlay.vue
+++ b/frontend/src/components/EditorMarkdownUserSettingsOverlay.vue
@@ -11,7 +11,7 @@
         color="white"
         :aria-label="t(`common.actions.refresh`)"
         icon="la:question-circle"
-        :href="siteStore.docsBase + `/editor/markdown`"
+        :href="siteStore.docsBase + `/guide/editors/markdown`"
         target="_blank"
         type="a" />
       <w-btn-group push>
diff --git a/frontend/src/components/FileManager.vue b/frontend/src/components/FileManager.vue
index 9f69d833e..37e20f5e9 100644
--- a/frontend/src/components/FileManager.vue
+++ b/frontend/src/components/FileManager.vue
@@ -72,7 +72,7 @@
           color="white"
           :aria-label="t(`common.actions.viewDocs`)"
           icon="la:question-circle"
-          :href="siteStore.docsBase + `/editor/file-manager`"
+          :href="siteStore.docsBase + `/guide/file-manager`"
           target="_blank">
           <!-- -> `WTooltip` already defaults to below-the-trigger, which is where a header wants it -->
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
diff --git a/frontend/src/components/GroupEditOverlay.vue b/frontend/src/components/GroupEditOverlay.vue
index 31ec7fc46..1e2ff0a73 100644
--- a/frontend/src/components/GroupEditOverlay.vue
+++ b/frontend/src/components/GroupEditOverlay.vue
@@ -191,7 +191,7 @@
             flat
             color="grey"
             type="a"
-            :href="siteStore.docsBase + `/admin/groups#rules`"
+            :href="siteStore.docsBase + `/admin/permissions#rules`"
             target="_blank" />
           <w-btn
             class="acrylic-btn mr-2"
@@ -441,7 +441,7 @@
                       flat
                       color="grey"
                       type="a"
-                      :href="siteStore.docsBase + `/admin/groups#permissions`"
+                      :href="siteStore.docsBase + `/admin/permissions#system-permissions`"
                       target="_blank" />
                   </template>
                 </w-card-header>
diff --git a/frontend/src/components/NavEditOverlay.vue b/frontend/src/components/NavEditOverlay.vue
index 77c363d2e..70413d5f4 100644
--- a/frontend/src/components/NavEditOverlay.vue
+++ b/frontend/src/components/NavEditOverlay.vue
@@ -14,7 +14,7 @@
         color="white"
         :aria-label="t(`common.actions.viewDocs`)"
         icon="la:question-circle"
-        :href="siteStore.docsBase + `/admin/editors/markdown`"
+        :href="siteStore.docsBase + `/guide/navigation`"
         target="_blank">
         <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
       </w-btn>
diff --git a/frontend/src/components/PageHeader.vue b/frontend/src/components/PageHeader.vue
index a2c69dbd5..e9da92422 100644
--- a/frontend/src/components/PageHeader.vue
+++ b/frontend/src/components/PageHeader.vue
@@ -209,7 +209,7 @@
           icon="la:question-circle"
           flat
           color="grey"
-          :href="siteStore.docsBase + `/editor/${editorStore.editor}`"
+          :href="siteStore.docsBase + `/guide/editors/${editorStore.editor}`"
           target="_blank"
           type="a">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
diff --git a/frontend/src/components/PagePropertiesDialog.vue b/frontend/src/components/PagePropertiesDialog.vue
index ac43174c1..db11f30e7 100644
--- a/frontend/src/components/PagePropertiesDialog.vue
+++ b/frontend/src/components/PagePropertiesDialog.vue
@@ -24,7 +24,7 @@
         rounded
         color="white"
         icon="la:question-circle"
-        :href="siteStore.docsBase + `/editor/properties`"
+        :href="siteStore.docsBase + `/guide/page-properties`"
         target="_blank"
         type="a" />
       <w-btn icon="la:times" dense flat @click="siteStore.sideDialogShown = false" />
diff --git a/frontend/src/components/TableEditorOverlay.vue b/frontend/src/components/TableEditorOverlay.vue
index 21175109c..1b17b275f 100644
--- a/frontend/src/components/TableEditorOverlay.vue
+++ b/frontend/src/components/TableEditorOverlay.vue
@@ -11,7 +11,7 @@
         color="white"
         :aria-label="t(`common.actions.viewDocs`)"
         icon="la:question-circle"
-        :href="siteStore.docsBase + `/editor/markdown`"
+        :href="siteStore.docsBase + `/guide/table-editor`"
         target="_blank"
         type="a" />
       <w-btn-group push>
diff --git a/frontend/src/pages/AdminFlags.vue b/frontend/src/pages/AdminFlags.vue
index d2a0a05d5..ea998947d 100644
--- a/frontend/src/pages/AdminFlags.vue
+++ b/frontend/src/pages/AdminFlags.vue
@@ -17,7 +17,7 @@
           flat
           color="grey"
           :aria-label="t(`common.actions.viewDocs`)"
-          :href="siteStore.docsBase + `/system/flags`"
+          :href="siteStore.docsBase + `/admin/flags`"
           target="_blank">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
         </w-btn>
diff --git a/frontend/src/pages/AdminGeneral.vue b/frontend/src/pages/AdminGeneral.vue
index 5cddedce9..fa14f830e 100644
--- a/frontend/src/pages/AdminGeneral.vue
+++ b/frontend/src/pages/AdminGeneral.vue
@@ -17,7 +17,7 @@
           flat
           color="grey"
           :aria-label="t(`common.actions.viewDocs`)"
-          :href="siteStore.docsBase + `/admin/sites#general`"
+          :href="siteStore.docsBase + `/admin/general`"
           target="_blank">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
         </w-btn>
diff --git a/frontend/src/pages/AdminIcons.vue b/frontend/src/pages/AdminIcons.vue
index 489af0900..238a015e4 100644
--- a/frontend/src/pages/AdminIcons.vue
+++ b/frontend/src/pages/AdminIcons.vue
@@ -19,7 +19,7 @@
           flat
           color="grey"
           :aria-label="t(`common.actions.viewDocs`)"
-          :href="siteStore.docsBase + `/system/icons`"
+          :href="siteStore.docsBase + `/admin/icons`"
           target="_blank">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
         </w-btn>
diff --git a/frontend/src/pages/AdminMail.vue b/frontend/src/pages/AdminMail.vue
index 2fe3372b2..99bc68387 100644
--- a/frontend/src/pages/AdminMail.vue
+++ b/frontend/src/pages/AdminMail.vue
@@ -19,7 +19,7 @@
           flat
           color="grey"
           :aria-label="t(`common.actions.viewDocs`)"
-          :href="siteStore.docsBase + `/system/mail`"
+          :href="siteStore.docsBase + `/admin/mail`"
           target="_blank">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
         </w-btn>
diff --git a/frontend/src/pages/AdminMetrics.vue b/frontend/src/pages/AdminMetrics.vue
index 42df151b6..d5bc12c7b 100644
--- a/frontend/src/pages/AdminMetrics.vue
+++ b/frontend/src/pages/AdminMetrics.vue
@@ -29,7 +29,7 @@
           flat
           color="grey"
           :aria-label="t(`common.actions.viewDocs`)"
-          :href="siteStore.docsBase + `/system/metrics`"
+          :href="siteStore.docsBase + `/admin/metrics`"
           target="_blank">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
         </w-btn>
diff --git a/frontend/src/pages/AdminRendering.vue b/frontend/src/pages/AdminRendering.vue
index 915e8a0c5..4669d0523 100644
--- a/frontend/src/pages/AdminRendering.vue
+++ b/frontend/src/pages/AdminRendering.vue
@@ -20,7 +20,7 @@
           icon="la:question-circle"
           flat
           color="grey"
-          :href="siteStore.docsBase + `/system/rendering`"
+          :href="siteStore.docsBase + `/admin/rendering`"
           target="_blank" />
         <w-btn
           class="mr-2 acrylic-btn"
diff --git a/frontend/src/pages/AdminScheduler.vue b/frontend/src/pages/AdminScheduler.vue
index b56d3d24d..26df8d0e2 100644
--- a/frontend/src/pages/AdminScheduler.vue
+++ b/frontend/src/pages/AdminScheduler.vue
@@ -35,7 +35,7 @@
           flat
           color="grey"
           :aria-label="t(`common.actions.viewDocs`)"
-          :href="siteStore.docsBase + `/system/scheduler`"
+          :href="siteStore.docsBase + `/admin/scheduler`"
           target="_blank">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
         </w-btn>
diff --git a/frontend/src/pages/AdminSearch.vue b/frontend/src/pages/AdminSearch.vue
index 26090b610..af15717b1 100644
--- a/frontend/src/pages/AdminSearch.vue
+++ b/frontend/src/pages/AdminSearch.vue
@@ -28,7 +28,7 @@
           flat
           color="grey"
           :aria-label="t(`common.actions.viewDocs`)"
-          :href="siteStore.docsBase + `/system/search`"
+          :href="siteStore.docsBase + `/admin/search`"
           target="_blank">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
         </w-btn>
diff --git a/frontend/src/pages/AdminSecurity.vue b/frontend/src/pages/AdminSecurity.vue
index 6c6d793fa..e6c037fed 100644
--- a/frontend/src/pages/AdminSecurity.vue
+++ b/frontend/src/pages/AdminSecurity.vue
@@ -17,7 +17,7 @@
           flat
           color="grey"
           :aria-label="t(`common.actions.viewDocs`)"
-          :href="siteStore.docsBase + `/system/security`"
+          :href="siteStore.docsBase + `/admin/security`"
           target="_blank">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
         </w-btn>
diff --git a/frontend/src/pages/AdminSystem.vue b/frontend/src/pages/AdminSystem.vue
index a6cec6f0c..6f5a4c0de 100644
--- a/frontend/src/pages/AdminSystem.vue
+++ b/frontend/src/pages/AdminSystem.vue
@@ -17,7 +17,7 @@
           flat
           color="grey"
           :aria-label="t(`common.actions.viewDocs`)"
-          :href="siteStore.docsBase + `/system/`"
+          :href="siteStore.docsBase + `/admin/system`"
           target="_blank">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
         </w-btn>
diff --git a/frontend/src/pages/AdminUsers.vue b/frontend/src/pages/AdminUsers.vue
index 25aed8e4b..c2191a5d0 100644
--- a/frontend/src/pages/AdminUsers.vue
+++ b/frontend/src/pages/AdminUsers.vue
@@ -25,7 +25,7 @@
           flat
           color="grey"
           :aria-label="t(`common.actions.viewDocs`)"
-          :href="siteStore.docsBase + `/admin/groups`"
+          :href="siteStore.docsBase + `/admin/users`"
           target="_blank">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
         </w-btn>
diff --git a/frontend/src/pages/AdminWebhooks.vue b/frontend/src/pages/AdminWebhooks.vue
index f442aa7a2..be3cf30c3 100644
--- a/frontend/src/pages/AdminWebhooks.vue
+++ b/frontend/src/pages/AdminWebhooks.vue
@@ -19,7 +19,7 @@
           flat
           color="grey"
           :aria-label="t(`common.actions.viewDocs`)"
-          :href="siteStore.docsBase + `/system/webhooks`"
+          :href="siteStore.docsBase + `/admin/webhooks`"
           target="_blank">
           <w-tooltip>{{ t(`common.actions.viewDocs`) }}</w-tooltip>
         </w-btn>
diff --git a/frontend/src/stores/site.js b/frontend/src/stores/site.js
index 5d1d5bef6..554889f5c 100644
--- a/frontend/src/stores/site.js
+++ b/frontend/src/stores/site.js
@@ -119,7 +119,7 @@ export const useSiteStore = defineStore('site', {
     },
     sideDialogShown: false,
     sideDialogComponent: '',
-    docsBase: 'https://beta.js.wiki/docs',
+    docsBase: 'https://docs.js.wiki',
     nav: {
       currentId: null,
       items: []