diff --git a/README.md b/README.md
index 33905bd23e..2d83bc6394 100644
--- a/README.md
+++ b/README.md
@@ -77,9 +77,9 @@ We are also available on [our public Mail development chat](https://cloud.nextcl
## Documentation
Need help? Check out our documentation. It's split into three parts.
-* [Admin documentation](doc/admin.md) (installation, configuration, troubleshooting)
+* [Admin documentation](https://docs.nextcloud.com/server/stable/admin_manual/groupware/mail.html) (installation, configuration, troubleshooting)
* [Developer documentation](doc/developer.md) (developer setup, nightly builds)
-* [User documentation](doc/user.md) (usage, keyboard shortcuts)
+* [User documentation](https://docs.nextcloud.com/server/stable/user_manual/en/groupware/mail.html) (usage)
## Credits
This project uses [CKEditor](https://ckeditor.com), which is licensed under the [GPLv2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 8a8a2754d3..0aca4ed7ea 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -41,8 +41,8 @@ Learn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud
kesselb
Mail
- https://github.com/nextcloud/mail/blob/main/doc/user.md
- https://github.com/nextcloud/mail/blob/main/doc/admin.md
+ https://docs.nextcloud.com/server/stable/user_manual/en/groupware/mail.html
+ https://docs.nextcloud.com/server/stable/admin_manual/groupware/mail.html
https://github.com/nextcloud/mail/blob/main/doc/developer.md
social