diff --git a/README.md b/README.md
index 9817d78db..bcdb32750 100644
--- a/README.md
+++ b/README.md
@@ -29,9 +29,9 @@ anyone to effortlessly host web applications on their server on their own terms.
 * Trivially migrate to another server keeping your apps and data (for example, switch your
   infrastructure provider or move to a bigger server).
 
-* Comprehensive [REST API](https://cloudron.io/documentation/developer/api/).
+* Comprehensive [REST API](https://docs.cloudron.io/api/).
 
-* [CLI](https://cloudron.io/documentation/cli/) to configure apps.
+* [CLI](https://docs.cloudron.io/custom-apps/cli/) to configure apps.
 
 * Alerts, audit logs, graphs, dns management ... and much more
 
@@ -41,7 +41,7 @@ Try our demo at https://my.demo.cloudron.io (username: cloudron password: cloudr
 
 ## Installing
 
-[Install script](https://cloudron.io/documentation/installation/) - [Pricing](https://cloudron.io/pricing.html)
+[Install script](https://docs.cloudron.io/installation/) - [Pricing](https://cloudron.io/pricing.html)
 
 **Note:** This repo is a small part of what gets installed on your server - there is
 the dashboard, database addons, graph container, base image etc. Cloudron also relies
@@ -50,6 +50,6 @@ clone this repo and npm install and expect something to work.
 
 ## Support
 
-* [Documentation](https://cloudron.io/documentation/)
+* [Documentation](https://docs.cloudron.io/)
 * [Forum](https://forum.cloudron.io/)
 
diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh
index ed4817ada..2918b44bc 100755
--- a/baseimage/initializeBaseUbuntuImage.sh
+++ b/baseimage/initializeBaseUbuntuImage.sh
@@ -130,7 +130,7 @@ timedatectl set-ntp 1
 timedatectl set-timezone UTC
 
 echo "==> Adding sshd configuration warning"
-sed -e '/Port 22/ i # NOTE: Cloudron only supports moving SSH to port 202. See https://cloudron.io/documentation/security/#securing-ssh-access' -i /etc/ssh/sshd_config
+sed -e '/Port 22/ i # NOTE: Cloudron only supports moving SSH to port 202. See https://docs.cloudron.io/security/#securing-ssh-access' -i /etc/ssh/sshd_config
 
 # https://bugs.launchpad.net/ubuntu/+source/base-files/+bug/1701068
 echo "==> Disabling motd news"
diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup
index 44a803847..e1fa9992b 100755
--- a/scripts/cloudron-setup
+++ b/scripts/cloudron-setup
@@ -53,7 +53,7 @@ eval set -- "${args}"
 
 while true; do
     case "$1" in
-    --help) echo "See https://cloudron.io/documentation/installation/ on how to install Cloudron"; exit 0;;
+    --help) echo "See https://docs.cloudron.io/installation/ on how to install Cloudron"; exit 0;;
     --provider) provider="$2"; shift 2;;
     --version) requestedVersion="$2"; shift 2;;
     --env)
diff --git a/scripts/cloudron-support b/scripts/cloudron-support
index 65cddc0ee..18ae7fefa 100755
--- a/scripts/cloudron-support
+++ b/scripts/cloudron-support
@@ -57,7 +57,7 @@ if [[ "`df --output="avail" / | sed -n 2p`" -lt "10240" ]]; then
     echo ""
     df -h
     echo ""
-    echo "To recover from a full disk, follow the guide at https://cloudron.io/documentation/troubleshooting/#recovery-after-disk-full"
+    echo "To recover from a full disk, follow the guide at https://docs.cloudron.io/troubleshooting/#recovery-after-disk-full"
     exit 1
 fi
 
diff --git a/setup/start/cloudron-motd b/setup/start/cloudron-motd
index 0c922f55a..bb09d2a29 100755
--- a/setup/start/cloudron-motd
+++ b/setup/start/cloudron-motd
@@ -14,8 +14,8 @@ if [[ -z "$(ls -A /home/yellowtent/boxdata/mail/dkim)" ]]; then
     printf "\t\t\t-------------------\n"
 
     printf '\n\e[1;32m%-6s\e[m\n\n' "Visit https://${ip} on your browser and accept the self-signed certificate to finish setup."
-    printf "Cloudron overview - https://cloudron.io/documentation/ \n"
-    printf "Cloudron setup - https://cloudron.io/documentation/installation/#setup \n"
+    printf "Cloudron overview - https://docs.cloudron.io/ \n"
+    printf "Cloudron setup - https://docs.cloudron.io/installation/#setup \n"
 else
     printf "\t\t\tNOTE TO CLOUDRON ADMINS\n"
     printf "\t\t\t-----------------------\n"
@@ -23,7 +23,7 @@ else
     printf "Cloudron relies on and may break your installation. Ubuntu security updates\n"
     printf "are automatically installed on this server every night.\n"
     printf "\n"
-    printf "Read more at https://cloudron.io/documentation/security/#os-updates\n"
+    printf "Read more at https://docs.cloudron.io/security/#os-updates\n"
 fi
 
 printf "\nFor help and more information, visit https://forum.cloudron.io\n\n"
diff --git a/src/backups.js b/src/backups.js
index a24eaf150..bce80251b 100644
--- a/src/backups.js
+++ b/src/backups.js
@@ -1523,9 +1523,9 @@ function checkConfiguration(callback) {
 
         let message = '';
         if (backupConfig.provider === 'noop') {
-            message = 'Cloudron backups are disabled. Please ensure this server is backed up using alternate means. See https://cloudron.io/documentation/backups/#storage-providers for more information.';
+            message = 'Cloudron backups are disabled. Please ensure this server is backed up using alternate means. See https://docs.cloudron.io/backups/#storage-providers for more information.';
         } else if (backupConfig.provider === 'filesystem' && !backupConfig.externalDisk) {
-            message = 'Cloudron backups are currently on the same disk as the Cloudron server instance. This is dangerous and can lead to complete data loss if the disk fails. See https://cloudron.io/documentation/backups/#storage-providers for storing backups in an external location.';
+            message = 'Cloudron backups are currently on the same disk as the Cloudron server instance. This is dangerous and can lead to complete data loss if the disk fails. See https://docs.cloudron.io/backups/#storage-providers for storing backups in an external location.';
         }
 
         callback(null, message);
diff --git a/src/mail_templates/app_down.ejs b/src/mail_templates/app_down.ejs
index 19d0189fe..30957368d 100644
--- a/src/mail_templates/app_down.ejs
+++ b/src/mail_templates/app_down.ejs
@@ -7,8 +7,8 @@ The application '<%= title %>' installed at <%= appFqdn %> is not responding.
 This is most likely a problem in the application.
 
 To resolve this, you can try the following:
-* Restart the app by opening the app's web terminal - https://cloudron.io/documentation/apps/#web-terminal
-* Restore the app to the latest backup - https://cloudron.io/documentation/backups/#restoring-an-app
+* Restart the app by opening the app's web terminal - https://docs.cloudron.io/apps/#web-terminal
+* Restore the app to the latest backup - https://docs.cloudron.io/backups/#restoring-an-app
 * Contact us via <%= supportEmail %> or https://forum.cloudron.io
 
 
diff --git a/src/mail_templates/backup_failed.ejs b/src/mail_templates/backup_failed.ejs
index a3f90d039..2b1b7649c 100644
--- a/src/mail_templates/backup_failed.ejs
+++ b/src/mail_templates/backup_failed.ejs
@@ -2,7 +2,7 @@
 
 Dear <%= cloudronName %> Admin,
 
-Cloudron failed to create a complete backup. Please see https://cloudron.io/documentation/troubleshooting/#backups
+Cloudron failed to create a complete backup. Please see https://docs.cloudron.io/troubleshooting/#backups
 for troubleshooting.
 
 Logs for this failure are available at <%= logUrl %>
diff --git a/src/mail_templates/certificate_renewal_error.ejs b/src/mail_templates/certificate_renewal_error.ejs
index db653a437..fd9eaf6b1 100644
--- a/src/mail_templates/certificate_renewal_error.ejs
+++ b/src/mail_templates/certificate_renewal_error.ejs
@@ -8,7 +8,7 @@ The Cloudron will attempt to renew the certificate every 12 hours
 until the certificate expires (at which point it will switch to
 using the fallback certificate).
 
-See https://cloudron.io/documentation/troubleshooting/#certificates to
+See https://docs.cloudron.io/troubleshooting/#certificates to
 double check if your server is configured correctly to obtain certificates
 via Let's Encrypt.
 
diff --git a/src/mail_templates/oom_event.ejs b/src/mail_templates/oom_event.ejs
index 6b4936dac..1d78baee4 100644
--- a/src/mail_templates/oom_event.ejs
+++ b/src/mail_templates/oom_event.ejs
@@ -6,8 +6,8 @@ Dear <%= cloudronName %> Admin,
 
 If this message appears repeatedly, give the app more memory.
 
-* To increase an app's memory limit - https://cloudron.io/documentation/apps/#memory-limit
-* To increase a service's memory limit - https://cloudron.io/documentation/troubleshooting/#services
+* To increase an app's memory limit - https://docs.cloudron.io/apps/#memory-limit
+* To increase a service's memory limit - https://docs.cloudron.io/troubleshooting/#services
 
 Out of memory event:
 
diff --git a/src/notifications.js b/src/notifications.js
index daa7f5b57..210af144e 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -156,11 +156,11 @@ function oomEvent(eventId, app, addon, containerId, event, callback) {
     if (app) {
         program = `App ${app.fqdn}`;
         title = `The application at ${app.fqdn} ran out of memory.`;
-        message = 'The application has been restarted automatically. If you see this notification often, consider increasing the [memory limit](https://cloudron.io/documentation/apps/#memory-limit)';
+        message = 'The application has been restarted automatically. If you see this notification often, consider increasing the [memory limit](https://docs.cloudron.io/apps/#memory-limit)';
     } else if (addon) {
         program = `${addon.name} service`;
         title = `The ${addon.name} service ran out of memory`;
-        message = 'The service has been restarted automatically. If you see this notification often, consider increasing the [memory limit](https://cloudron.io/documentation/troubleshooting/#services)';
+        message = 'The service has been restarted automatically. If you see this notification often, consider increasing the [memory limit](https://docs.cloudron.io/troubleshooting/#services)';
     } else { // this never happens currently
         program = `Container ${containerId}`;
         title = `The container ${containerId} ran out of memory`;
diff --git a/src/settings.js b/src/settings.js
index 9bbff7522..5e9ae5015 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -182,8 +182,8 @@ let gDefaults = (function () {
         remoteSupport: true,
         ticketFormBody:
             'Use this form to open support tickets. You can also write directly to [support@cloudron.io](mailto:support@cloudron.io).\n\n'
-            + '* [Knowledge Base & App Docs](https://cloudron.io/documentation/apps/?support_view)\n'
-            + '* [Custom App Packaging & API](https://cloudron.io/developer/packaging/?support_view)\n'
+            + '* [Knowledge Base & App Docs](https://docs.cloudron.io/apps/?support_view)\n'
+            + '* [Custom App Packaging & API](https://docs.cloudron.io/custom-apps/tutorial/?support_view)\n'
             + '* [Forum](https://forum.cloudron.io/)\n\n',
         submitTickets: true
     };