diff --git a/web/projects/setup-wizard/src/app/components/documentation.component.ts b/web/projects/setup-wizard/src/app/components/documentation.component.ts
index 07d1b4a12..f8ccc25f4 100644
--- a/web/projects/setup-wizard/src/app/components/documentation.component.ts
+++ b/web/projects/setup-wizard/src/app/components/documentation.component.ts
@@ -46,7 +46,7 @@ import { DocsLinkDirective } from '@start9labs/shared'
                 Download your server's Root CA and
                 <a
                   docsLink
-                  path="/start-os/user-manual/trust-ca.html"
+                  path="/start-os/trust-ca.html"
                   style="color: #6866cc; font-weight: bold; text-decoration: none"
                 >
                   follow instructions
diff --git a/web/projects/ui/src/app/routes/login/ca-wizard/ca-wizard.component.html b/web/projects/ui/src/app/routes/login/ca-wizard/ca-wizard.component.html
index 52c87c61c..18bb8b3e9 100644
--- a/web/projects/ui/src/app/routes/login/ca-wizard/ca-wizard.component.html
+++ b/web/projects/ui/src/app/routes/login/ca-wizard/ca-wizard.component.html
@@ -46,7 +46,7 @@
           tuiButton
           docsLink
           size="s"
-          path="/start-os/user-manual/trust-ca.html"
+          path="/start-os/trust-ca.html"
           iconEnd="@tui.external-link"
         >
           {{ 'View instructions' | i18n }}
diff --git a/web/projects/ui/src/app/routes/portal/components/header/menu.component.ts b/web/projects/ui/src/app/routes/portal/components/header/menu.component.ts
index 55f5bc354..d11f7935b 100644
--- a/web/projects/ui/src/app/routes/portal/components/header/menu.component.ts
+++ b/web/projects/ui/src/app/routes/portal/components/header/menu.component.ts
@@ -55,7 +55,7 @@ import { ABOUT } from './about.component'
             docsLink
             new
             iconStart="@tui.book-open-text"
-            path="/start-os/user-manual"
+            path="/start-os/index.html"
           >
             {{ 'User manual' | i18n }}
           </a>
diff --git a/web/projects/ui/src/app/routes/portal/routes/backups/modals/jobs.component.ts b/web/projects/ui/src/app/routes/portal/routes/backups/modals/jobs.component.ts
index 970745044..a4fad6357 100644
--- a/web/projects/ui/src/app/routes/portal/routes/backups/modals/jobs.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/backups/modals/jobs.component.ts
@@ -26,7 +26,7 @@ import { DocsLinkDirective } from 'projects/shared/src/public-api'
       Scheduling automatic backups is an excellent way to ensure your StartOS
       data is safely backed up. StartOS will issue a notification whenever one
       of your scheduled backups succeeds or fails.
-      <a tuiLink docsLink path="/start-os/user-manual/backup-create.html">
+      <a tuiLink docsLink path="/start-os/backup-create.html">
         View instructions
       </a>
     </tui-notification>
diff --git a/web/projects/ui/src/app/routes/portal/routes/backups/modals/targets.component.ts b/web/projects/ui/src/app/routes/portal/routes/backups/modals/targets.component.ts
index 6bde58daa..6ed523e97 100644
--- a/web/projects/ui/src/app/routes/portal/routes/backups/modals/targets.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/backups/modals/targets.component.ts
@@ -31,7 +31,7 @@ import { DocsLinkDirective } from 'projects/shared/src/public-api'
       backups. They can be physical drives plugged into your server, shared
       folders on your Local Area Network (LAN), or third party clouds such as
       Dropbox or Google Drive.
-      <a tuiLink docsLink path="/start-os/user-manual/backup-create.html">
+      <a tuiLink docsLink path="/start-os/backup-create.html">
         View instructions
       </a>
     </tui-notification>
diff --git a/web/projects/ui/src/app/routes/portal/routes/metrics/time.component.ts b/web/projects/ui/src/app/routes/portal/routes/metrics/time.component.ts
index b6f1247e7..9bc6da0ad 100644
--- a/web/projects/ui/src/app/routes/portal/routes/metrics/time.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/metrics/time.component.ts
@@ -49,7 +49,7 @@ import { TimeService } from 'src/app/services/time.service'
             docsLink
             iconEnd="@tui.external-link"
             appearance=""
-            path="/start-os/faq/index.html"
+            path="/start-os/faq.html"
             fragment="#clock-sync-failure"
             [pseudo]="true"
             [textContent]="'the docs' | i18n"
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/authorities/authorities.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/authorities/authorities.component.ts
index 330849f52..590da78ae 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/authorities/authorities.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/authorities/authorities.component.ts
@@ -21,7 +21,7 @@ import { AuthoritiesTableComponent } from './table.component'
           tuiIconButton
           size="xs"
           docsLink
-          path="/start-os/user-manual/trust-ca.html"
+          path="/start-os/trust-ca.html"
           appearance="icon"
           iconStart="@tui.book-open-text"
         >
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backups.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backups.component.ts
index c4b4bdc0c..fe3471190 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backups.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backups.component.ts
@@ -61,7 +61,7 @@ import { BACKUP_RESTORE } from './restore.component'
             <a
               tuiLink
               docsLink
-              path="/start-os/user-manual/backup-create.html"
+              path="/start-os/backup-create.html"
               appearance="action-grayscale"
               iconEnd="@tui.external-link"
               [textContent]="'View instructions' | i18n"
@@ -74,7 +74,7 @@ import { BACKUP_RESTORE } from './restore.component'
             <a
               tuiLink
               docsLink
-              path="/start-os/user-manual/backup-restore.html"
+              path="/start-os/backup-restore.html"
               appearance="action-grayscale"
               iconEnd="@tui.external-link"
               [textContent]="'View instructions' | i18n"
@@ -116,7 +116,7 @@ import { BACKUP_RESTORE } from './restore.component'
           <a
             tuiLink
             docsLink
-            path="/start-os/user-manual/backup-create.html"
+            path="/start-os/backup-create.html"
             fragment="#network-folder"
             appearance="action-grayscale"
             iconEnd="@tui.external-link"
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/dns/dns.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/dns/dns.component.ts
index 091856bb4..454ed2ca9 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/dns/dns.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/dns/dns.component.ts
@@ -46,7 +46,7 @@ const ipv6 =
                 tuiIconButton
                 size="xs"
                 docsLink
-                path="/start-os/user-manual/dns.html"
+                path="/start-os/dns.html"
                 appearance="icon"
                 iconStart="@tui.book-open-text"
               >
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/gateways/gateways.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/gateways/gateways.component.ts
index 1b96e5f07..13d02b26e 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/gateways/gateways.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/gateways/gateways.component.ts
@@ -42,7 +42,7 @@ import { GatewaysTableComponent } from './table.component'
           tuiIconButton
           size="xs"
           docsLink
-          path="/start-os/user-manual/gateways.html"
+          path="/start-os/gateways.html"
           appearance="icon"
           iconStart="@tui.book-open-text"
         >
@@ -71,7 +71,7 @@ import { GatewaysTableComponent } from './table.component'
                 tuiIconButton
                 size="xs"
                 docsLink
-                path="/start-os/user-manual/gateways.html"
+                path="/start-os/gateways.html"
                 fragment="#outbound-traffic"
                 appearance="icon"
                 iconStart="@tui.book-open-text"
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/smtp/smtp.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/smtp/smtp.component.ts
index ed037a25b..6559a028e 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/smtp/smtp.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/smtp/smtp.component.ts
@@ -55,7 +55,7 @@ function detectProviderKey(host: string | undefined): string {
                 tuiIconButton
                 size="xs"
                 docsLink
-                path="/start-os/user-manual/smtp.html"
+                path="/start-os/smtp.html"
                 appearance="icon"
                 iconStart="@tui.book-open-text"
               >
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/ssh/ssh.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/ssh/ssh.component.ts
index 500acb399..101d26ea7 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/ssh/ssh.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/ssh/ssh.component.ts
@@ -39,7 +39,7 @@ import { SSHTableComponent } from './table.component'
           tuiIconButton
           size="xs"
           docsLink
-          path="/start-os/user-manual/ssh.html"
+          path="/start-os/ssh.html"
           appearance="icon"
           iconStart="@tui.book-open-text"
         >
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/wifi/wifi.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/wifi/wifi.component.ts
index 24a30ab15..ce4ee3fee 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/wifi/wifi.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/wifi/wifi.component.ts
@@ -54,7 +54,7 @@ import { wifiSpec } from './wifi.const'
             tuiIconButton
             size="xs"
             docsLink
-            path="/start-os/user-manual/wifi.html"
+            path="/start-os/wifi.html"
             appearance="icon"
             iconStart="@tui.book-open-text"
           >