diff --git a/developer_manual/bugtracker/index.rst b/developer_manual/bugtracker/index.rst
index 9c0e19f35..886ead0d3 100644
--- a/developer_manual/bugtracker/index.rst
+++ b/developer_manual/bugtracker/index.rst
@@ -13,20 +13,17 @@ Bugtracker
 Thank you for helping Nextcloud by reporting bugs. Before submitting an issue, please read
 `Issue submission guidelines`_ first.
 
-* If the issue is with the Nextcloud server, report it to the `Core repository`_
-* If the issue is with the Nextcloud client, report it to the `Client repository`_
+* If the issue is with the Nextcloud server, report it to the `Server repository`_
 * If the issue with with an Nextcloud app, report it to where that app is developed
 * If the app is listed in our `main github repository`_ report it to the correct sub 
   repository
 * If the app is listed in the `apps repository`_ report it there
 
-Please note that the mailing list should not be used for bug reports, as it is hard to track them there.
+Please note that the forums should not be used for bug reports, as it is hard to track them there.
 
 
 
 
-.. _Issue submission guidelines: https://github.com/owncloud/core/blob/master/CONTRIBUTING.md#submitting-issues
-.. _Core repository:  https://github.com/owncloud/core/issues
-.. _Client repository: https://github.com/owncloud/client/issues
-.. _main github repository: https://github.com/owncloud
-.. _apps repository: https://github.com/owncloud/apps/issues
+.. _Issue submission guidelines: https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md#submitting-issues
+.. _Server repository:  https://github.com/nextcloud/server/issues
+.. _main github repository: https://github.com/nextcloud