diff --git a/developer_manual/android_library/index.rst b/developer_manual/android_library/index.rst
index e69371fb9..51570952a 100644
--- a/developer_manual/android_library/index.rst
+++ b/developer_manual/android_library/index.rst
@@ -18,7 +18,7 @@ the source code `in GitHub <https://github.com/nextcloud/android/>`_. The
 setup and process of contribution is
 `documented here <https://github.com/nextcloud/android/blob/master/SETUP.md>`_.
 
-You might want to start with doing one or two `starter issues <https://github.com/nextcloud/android/issues?q=is%3Aopen+is%3Aissue+label%3A%22starter+issue%22>`_
+You might want to start with doing one or two `good first issues <https://github.com/nextcloud/android/labels/good%20first%20issue>`_
 to get into the code and note our :doc:`../general/index`.
 
 Nextcloud Android library
diff --git a/developer_manual/general/codingguidelines.rst b/developer_manual/general/codingguidelines.rst
index c6ac8503a..c51a5e1bc 100644
--- a/developer_manual/general/codingguidelines.rst
+++ b/developer_manual/general/codingguidelines.rst
@@ -29,7 +29,7 @@ The most important labels and their meaning:
 * #enhancement - this issue is a feature request/idea for improvement of Nextcloud
 * #design - this needs help from the design team or is a design-related issue/pull request
 * #technical debt - this issue or PR is about `technical debt <http://en.wikipedia.org/wiki/Technical_debt>`_
-* #starter issue - these are issues which are relatively easy to solve and ideal for people who want to learn how to code in Nextcloud
+* #good first issue - these are issues which are relatively easy to solve and ideal for people who want to learn how to code in Nextcloud
 * #needs info - this issue needs further information from the reporter, see :doc:`../bugtracker/triaging`
 * #high #medium #low signify how important the bug is.
 * Tags showing the state of the issue or PR, numbered 0-4: