diff --git a/webadmin/src/index.html b/webadmin/src/index.html
index ca04d6fc2..2aa9d78be 100644
--- a/webadmin/src/index.html
+++ b/webadmin/src/index.html
@@ -131,7 +131,7 @@
                             </fieldset>
                         </div>
                         <div ng-show="config.provider !== 'caas' && config.update.box.upgrade">
-                            <b>Please use the CLI tool to upgrade by following the instructions <a href="https://cloudron.io/references/selfhosting.html#updates" target="_blank" >here</a>.</b>
+                            <b>Please use the CLI tool to upgrade by following the instructions <a href="https://cloudron.io/references/selfhosting/index.html#updates" target="_blank" >here</a>.</b>
                         </div>
                     </div>
                 </div>
diff --git a/webadmin/src/views/email.html b/webadmin/src/views/email.html
index 6f246ca32..018415d2d 100644
--- a/webadmin/src/views/email.html
+++ b/webadmin/src/views/email.html
@@ -44,7 +44,7 @@
     <div class="row">
         <div class="col-md-12">
             Cloudron has a built-in email server that allows users to send and receive email for your domain.
-            The <a href="https://cloudron.io/references/usermanual.html#email" target="_blank">User manual</a> has information on how to setup email clients.
+            The <a href="https://cloudron.io/references/usermanual/index.html#email" target="_blank">User manual</a> has information on how to setup email clients.
         </div>
     </div>
     <br/>
@@ -53,7 +53,7 @@
             <button ng-class="mailConfig.enabled ? 'btn btn-danger' : 'btn btn-primary'" ng-click="email.toggle()" ng-enabled="mailConfig">{{ mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
         </div>
         <div class="col-md-12" ng-show="dnsConfig.provider === 'caas'">
-            <span class="text-danger text-bold">This feature requires the Cloudron to be on <a href="https://cloudron.io/references/usermanual.html#entire-cloudron-on-a-custom-domain" target="_blank">custom domain</a>.</span>
+            <span class="text-danger text-bold">This feature requires the Cloudron to be on <a href="https://cloudron.io/references/usermanual/index.html#entire-cloudron-on-a-custom-domain" target="_blank">custom domain</a>.</span>
         </div>
     </div>
 </div>
diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index 954fd50d5..f7e3a4c8d 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -152,7 +152,7 @@
                         <p class="has-error text-center" ng-show="configureBackup.error">{{ configureBackup.error.generic }}</p>
 
                         <div class="form-group">
-                            <label class="control-label" for="storageProviderProvider">Storage provider <sup><a ng-href="{{ config.webServerOrigin }}/references/selfhosting.html#backups" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+                            <label class="control-label" for="storageProviderProvider">Storage provider <sup><a ng-href="{{ config.webServerOrigin }}/references/selfhosting/index.html#backups" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
                             <select class="form-control" id="storageProviderProvider" ng-model="configureBackup.provider" ng-options="a.value as a.name for a in storageProvider" ng-change=configureBackup.clearForm()></select>
                         </div>
 
diff --git a/webadmin/src/views/tokens.html b/webadmin/src/views/tokens.html
index 500259eb2..0d9df4abd 100644
--- a/webadmin/src/views/tokens.html
+++ b/webadmin/src/views/tokens.html
@@ -91,10 +91,10 @@
     <div class="row">
         <div class="col-xs-12">
             <p>
-                The Cloudron <a href="https://cloudron.io/references/api.html" target="_blank">REST API</a> can be used to manage all aspects of the Cloudron like adding users and installing apps.
+                The Cloudron <a href="https://cloudron.io/references/api/index.html" target="_blank">REST API</a> can be used to manage all aspects of the Cloudron like adding users and installing apps.
                 <br/>
                 <br/>
-                You can develop apps for the Cloudron using the <a href="https://cloudron.io/references/cli.html" target="_blank">command-line tool</a>. See the <a href="{{ config.webServerOrigin }}/documentation.html" target="_blank">docs</a> for more information.
+                You can develop apps for the Cloudron using the <a href="https://cloudron.io/knowledge-base/CLI/index.html" target="_blank">command-line tool</a>. See the <a href="{{ config.webServerOrigin }}/documentation.html" target="_blank">docs</a> for more information.
             </p>
         </div>
     </div>
@@ -113,7 +113,7 @@
     <div class="grid-item-top">
         <div class="row">
             <div class="col-xs-12">
-                <p>These tokens can be used to access the <a href="https://cloudron.io/references/api.html" target="_blank">Cloudron API</a>. They have the <b>admin</b> <a href="https://cloudron.io/references/api.html#scopes" target="_blank">scope</a> and do not expire.</p>
+                <p>These tokens can be used to access the <a href="https://cloudron.io/references/api/index.html" target="_blank">Cloudron API</a>. They have the <b>admin</b> <a href="https://cloudron.io/references/api/index.html#scopes" target="_blank">scope</a> and do not expire.</p>
                 <br/>
                 <h4 class="text-muted">Active Tokens</h4>
                 <hr/>
diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index 200bb37b9..a37868bfb 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -254,7 +254,7 @@
                 <div class="col-lg-12">
                     <span ng-show="mailConfig.enabled">
                         Each user has a mailbox at <b><i>username</i>@{{ config.fqdn }}</b>.
-                        Please refer to the <a href="https://cloudron.io/references/usermanual.html#email" target="_blank">user documentation</a> on how to use Cloudron email accounts.
+                        Please refer to the <a href="https://cloudron.io/references/usermanual/index.html#email" target="_blank">user documentation</a> on how to use Cloudron email accounts.
                         <br/>
                         <br/>
                     </span>