diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7d644a7d854..4527ac3487d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -83,5 +83,5 @@ Before we can accept your pull request, you need to [sign our CLA](https://grafa
 
 - Set up your [development environment](contribute/developer-guide.md).
 - Learn how to [contribute to our documentation](contribute/documentation/README.md).
-- Get started [developing plugins](/developers/plugin-tools) for Grafana.
+- Get started [developing plugins](https://grafana.com/developers/plugin-tools) for Grafana.
 - Look through the resources in the [contribute](contribute) folder.
diff --git a/docs/sources/administration/data-source-management/index.md b/docs/sources/administration/data-source-management/index.md
index f131b8edbd8..3ac639e7a64 100644
--- a/docs/sources/administration/data-source-management/index.md
+++ b/docs/sources/administration/data-source-management/index.md
@@ -195,4 +195,4 @@ For more documentation on a specific data source plugin's features, including it
 
 ### Create a data source plugin
 
-To build your own data source plugin, refer to the ["Build a data source plugin"](/developers/plugin-tools/tutorials/build-a-data-source-plugin) tutorial and our documentation about [building a plugin](/developers/plugins-tools).
+To build your own data source plugin, refer to the ["Build a data source plugin"](/developers/plugin-tools/tutorials/build-a-data-source-plugin) tutorial and our documentation about [building a plugin](/developers/plugin-tools).
diff --git a/docs/sources/datasources/_index.md b/docs/sources/datasources/_index.md
index 44a95990b58..d5332117bea 100644
--- a/docs/sources/datasources/_index.md
+++ b/docs/sources/datasources/_index.md
@@ -29,7 +29,8 @@ After you add and configure a data source, you can use it as an input for many o
 This documentation describes how to manage data sources in general,
 and how to configure or query the built-in data sources.
 For other data sources, refer to the list of [datasource plugins](/grafana/plugins/).
-To develop a custom plugin, refer to our [plugin development documentation](/developers/plugin-tools).
+
+To develop a custom plugin, refer to [Build a plugin](/developers/plugin-tools).
 
 ## Manage data sources
 
diff --git a/docs/sources/developers/_index.md b/docs/sources/developers/_index.md
index 8ec4b6d0027..44c6ca4a2e7 100644
--- a/docs/sources/developers/_index.md
+++ b/docs/sources/developers/_index.md
@@ -14,7 +14,7 @@ weight: 190
 Go to the [Grafana developer portal](/developers) to access the following documentation:
 
 - [Grafana plugin development](/developers/plugin-tools)
-- [Grafana UI component library](https://developers.grafana.com)
+- [Grafana design system](https://developers.grafana.com)
 - [Grafana Scenes](/developers/scenes)
 - [Grafana data plane](/developers/dataplane)