diff --git a/docs/sources/breaking-changes/breaking-changes-v10-0.md b/docs/sources/breaking-changes/breaking-changes-v10-0.md
index bd1a3c63f7e..97fb6c2c67e 100644
--- a/docs/sources/breaking-changes/breaking-changes-v10-0.md
+++ b/docs/sources/breaking-changes/breaking-changes-v10-0.md
@@ -343,7 +343,7 @@ Here are some of the benefits of create-plugin:
 
 - **Improved testing capabilities:** Testing plugins with @grafana/create-plugin is much easier with GitHub workflows that automate unit and e2e test runs whenever changes are pushed to GitHub.
 
-- **Better documentation:** The [documentation](https://grafana.github.io/plugin-tools/docs/creating-a-plugin) for @grafana/create-plugin is more comprehensive and easier to discover than that of @grafana/toolkit.
+- **Better documentation:** The [documentation](https://grafana.github.io/plugin-tools/docs/get-started/) for @grafana/create-plugin is more comprehensive and easier to discover than that of @grafana/toolkit.
 
 #### Migration path
 
@@ -361,7 +361,7 @@ npx @grafana/create-plugin@latest migrate
 
 #### Learn more
 
-- [Migration guide](https://grafana.github.io/plugin-tools/docs/getting-started/migrating-from-toolkit/)
+- [Migration guide](https://grafana.github.io/plugin-tools/docs/get-started/migrate-from-toolkit)
 
 ## Deprecations
 
diff --git a/docs/sources/developers/plugins/create-a-grafana-plugin/develop-a-plugin/_index.md b/docs/sources/developers/plugins/create-a-grafana-plugin/develop-a-plugin/_index.md
index de60223457f..8f676c9af74 100644
--- a/docs/sources/developers/plugins/create-a-grafana-plugin/develop-a-plugin/_index.md
+++ b/docs/sources/developers/plugins/create-a-grafana-plugin/develop-a-plugin/_index.md
@@ -29,4 +29,4 @@ This section contains how-to topics for developing Grafana plugins:
 
 Additional resources:
 
-- [Build a Grafana plugin with the create-plugin tool](https://grafana.github.io/plugin-tools/docs/getting-started/creating-a-plugin)
+- [Build a Grafana plugin with the create-plugin tool](https://grafana.github.io/plugin-tools/docs/get-started/).
diff --git a/docs/sources/developers/plugins/get-started-with-plugins/_index.md b/docs/sources/developers/plugins/get-started-with-plugins/_index.md
index cab6e72a3f1..a9ab2bca1ec 100644
--- a/docs/sources/developers/plugins/get-started-with-plugins/_index.md
+++ b/docs/sources/developers/plugins/get-started-with-plugins/_index.md
@@ -22,6 +22,6 @@ This section contains guidance for building plugins:
 
 Additional resources:
 
-- [Get started with creating a plugin](https://grafana.github.io/plugin-tools/docs/getting-started)
+- [Get started with creating a plugin](https://grafana.github.io/plugin-tools/docs/get-started/)
 - [Types of Grafana plugins](/docs/grafana/latest/administration/plugin-management/)
-- [Set up your development environment](https://grafana.github.io/plugin-tools/docs/development/docker)
+- [Set up your development environment](https://grafana.github.io/plugin-tools/docs/get-started/set-up-development-environment)
diff --git a/docs/sources/developers/plugins/migration-guide/v6.x-v7.x/_index.md b/docs/sources/developers/plugins/migration-guide/v6.x-v7.x/_index.md
index eef13f824e8..f98b71db40a 100644
--- a/docs/sources/developers/plugins/migration-guide/v6.x-v7.x/_index.md
+++ b/docs/sources/developers/plugins/migration-guide/v6.x-v7.x/_index.md
@@ -41,7 +41,7 @@ With Grafana 7.0, we released a new tool for making it easier to develop plugins
 
 For more information, refer to [@grafana/toolkit](https://www.npmjs.com/package/@grafana/toolkit).
 
-{{% admonition type="note" %}} As of Grafana 10.0, `@grafana/toolkit` is deprecated. It is replaced by the [`create-plugin`](https://grafana.github.io/plugin-tools/docs/getting-started/creating-a-plugin) tool.
+{{% admonition type="note" %}} As of Grafana 10.0, `@grafana/toolkit` is deprecated. It is replaced by the [`create-plugin`](https://grafana.github.io/plugin-tools/docs/get-started/) tool.
 {{% /admonition %}}
 
 ### Field options