diff --git a/.github/release-issue-template.md b/.github/release-issue-template.md
index 3be2bf7d..f7263077 100644
--- a/.github/release-issue-template.md
+++ b/.github/release-issue-template.md
@@ -19,7 +19,7 @@ You can see the Runtime version on prod [on grafana](https://lightbendcloud.graf
 
 ### Fix and publish docs
 
-- [ ] If relevant, update the [supported version in the main docs](https://github.com/lightbend/kalix-docs/blob/main/docs/modules/ROOT/partials/include.adoc#L20) (affects [Supported Versions](https://docs.kalix.io/setting-up/index.html#_supported_languages))
+- [ ] If relevant, update the [supported version in the main docs](https://github.com/lightbend/kalix-docs/blob/main/docs/modules/ROOT/partials/include.adoc#L20) (affects [SDK Support table](https://docs.kalix.io/sdks/index.html#_sdk_support))
 - [ ] Add an item to the [Release Notes](https://github.com/lightbend/kalix-docs/blob/main/docs/modules/release-notes/pages/index.adoc) in the documentation
 - [ ] [Release](https://github.com/lightbend/kalix-docs/blob/main/RELEASING.md#general--sdk-docs) the Kalix documentation to get the SDK docs updates published. After running the commands in the previous link the release is [automated](https://github.com/lightbend/kalix-docs/blob/main/RELEASING.md#automated-releasing). 
 
diff --git a/docs/src/modules/javascript/pages/kickstart.adoc b/docs/src/modules/javascript/pages/kickstart.adoc
index 1cf83209..37d12458 100644
--- a/docs/src/modules/javascript/pages/kickstart.adoc
+++ b/docs/src/modules/javascript/pages/kickstart.adoc
@@ -21,7 +21,7 @@ Before running the code generation tools, make sure that you have the following:
 * Node >= {minimum_node_version}
 * `npm` or `yarn`
 * Docker >= {minimum_docker_version} (to run locally)
-* The https://docs.kalix.io/getting-started/set-up-development-env.html#_kalix_cli[`kalix` CLI downloaded]
+* The https://docs.kalix.io/kalix/install-kalix.html[`kalix` CLI installed]
 * A https://docs.kalix.io/projects/container-registries.html[configured Docker Registry]
 * A https://console.kalix.io/register[Kalix account]
 * A https://docs.kalix.io/projects/index.html[Kalix project]
diff --git a/npm-js/create-kalix-entity/template/base-common/README.md b/npm-js/create-kalix-entity/template/base-common/README.md
index 058f50b9..445cb32f 100644
--- a/npm-js/create-kalix-entity/template/base-common/README.md
+++ b/npm-js/create-kalix-entity/template/base-common/README.md
@@ -107,9 +107,7 @@ ERROR:
 
 ## Deploying to Kalix
 
-To deploy your service, install the `kalix` CLI as documented in [Setting up a local development
-environment](https://docs.kalix.io/getting-started/set-up-development-env.html) and configure a
-Docker Registry to upload your docker image to.
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json` and refer to
 [Configuring registries](https://docs.kalix.io/projects/container-registries.html) for more
diff --git a/samples/js/js-customer-registry-quickstart/README.md b/samples/js/js-customer-registry-quickstart/README.md
index 5a64e67e..af6c1c8f 100644
--- a/samples/js/js-customer-registry-quickstart/README.md
+++ b/samples/js/js-customer-registry-quickstart/README.md
@@ -120,9 +120,7 @@ HTTP endpoint. Example calls using [grpcurl](https://github.com/fullstorydev/grp
 
 ## Deploying
 
-To deploy your service, install the `kalix` CLI as documented in [setting up a local development
-environment](https://docs.kalix.io/getting-started/set-up-development-env.html) and configure a
-Docker Registry to upload your docker image to.
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json`. Refer to
 [configuring registries](https://docs.kalix.io/projects/container-registries.html) for more
diff --git a/samples/js/js-eventsourced-shopping-cart/README.md b/samples/js/js-eventsourced-shopping-cart/README.md
index 689ebe37..41dfb481 100644
--- a/samples/js/js-eventsourced-shopping-cart/README.md
+++ b/samples/js/js-eventsourced-shopping-cart/README.md
@@ -90,7 +90,7 @@ grpcurl --plaintext -d '{"cart_id": "cart1", "product_id": "kalix-tshirt"}' loca
 
 ## Deploying to Kalix
 
-To deploy your service, install the `kalix` CLI as documented in [Setting up a local development environment](https://docs.kalix.io/getting-started/set-up-development-env.html) and configure a Docker Registry to upload your docker image to.
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json` and refer to [Configuring registries](https://docs.kalix.io/projects/container-registries.html) for more information on how to make your docker image available to Kalix.
 
diff --git a/samples/js/js-replicated-entity-shopping-cart/README.md b/samples/js/js-replicated-entity-shopping-cart/README.md
index 64843e52..04da23ef 100644
--- a/samples/js/js-replicated-entity-shopping-cart/README.md
+++ b/samples/js/js-replicated-entity-shopping-cart/README.md
@@ -90,8 +90,7 @@ grpcurl --plaintext -d '{"cart_id": "cart1"}' localhost:9000 com.example.shoppin
 
 ## Deploying
 
-To deploy your service, install the `kalix` CLI as documented in [Setting up a local development
-environment](https://docs.kalix.io/getting-started/set-up-development-env.html) and
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and
 configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json` and refer to [Configuring
diff --git a/samples/js/js-shopping-cart-quickstart/README.md b/samples/js/js-shopping-cart-quickstart/README.md
index 49f00b84..d8de2c7a 100644
--- a/samples/js/js-shopping-cart-quickstart/README.md
+++ b/samples/js/js-shopping-cart-quickstart/README.md
@@ -103,9 +103,7 @@ HTTP endpoint. Example calls using [grpcurl](https://github.com/fullstorydev/grp
 
 ## Deploying
 
-To deploy your service, install the `kalix` CLI as documented in [setting up a local development
-environment](https://docs.kalix.io/getting-started/set-up-development-env.html) and configure a
-Docker Registry to upload your docker image to.
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json`. Refer to
 [configuring registries](https://docs.kalix.io/projects/container-registries.html) for more
diff --git a/samples/js/js-valueentity-shopping-cart/README.md b/samples/js/js-valueentity-shopping-cart/README.md
index 8f7a25a6..712322e8 100644
--- a/samples/js/js-valueentity-shopping-cart/README.md
+++ b/samples/js/js-valueentity-shopping-cart/README.md
@@ -86,9 +86,7 @@ grpcurl --plaintext -d '{"cart_id": "cart1"}' localhost:9000 com.example.shoppin
 
 ## Deploying
 
-To deploy your service, install the `kalix` CLI as documented in
-[Setting up a local development environment](https://docs.kalix.io/getting-started/set-up-development-env.html)
-and configure a Docker Registry to upload your docker image to.
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json` and refer to
 [Configuring registries](https://docs.kalix.io/projects/container-registries.html)
diff --git a/samples/js/valueentity-counter/README.md b/samples/js/valueentity-counter/README.md
index bc38a9df..a562395d 100644
--- a/samples/js/valueentity-counter/README.md
+++ b/samples/js/valueentity-counter/README.md
@@ -86,9 +86,7 @@ ERROR:
 
 ## Deploying
 
-To deploy your service, install the `kalix` CLI as documented in
-[Setting up a local development environment](https://docs.kalix.io/getting-started/set-up-development-env.html)
-and configure a Docker Registry to upload your docker image to.
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json` and refer to
 [Configuring registries](https://docs.kalix.io/projects/container-registries.html)
diff --git a/samples/ts/ts-customer-registry-quickstart/README.md b/samples/ts/ts-customer-registry-quickstart/README.md
index 9a1cf9ab..35c9de10 100644
--- a/samples/ts/ts-customer-registry-quickstart/README.md
+++ b/samples/ts/ts-customer-registry-quickstart/README.md
@@ -122,9 +122,7 @@ HTTP endpoint. Example calls using [grpcurl](https://github.com/fullstorydev/grp
 
 ## Deploying
 
-To deploy your service, install the `kalix` CLI as documented in [setting up a local development
-environment](https://docs.kalix.io/getting-started/set-up-development-env.html) and configure a
-Docker Registry to upload your docker image to.
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json`. Refer to
 [configuring registries](https://docs.kalix.io/projects/container-registries.html) for more
diff --git a/samples/ts/ts-eventsourced-shopping-cart/README.md b/samples/ts/ts-eventsourced-shopping-cart/README.md
index 1a3d9e17..def66b3d 100644
--- a/samples/ts/ts-eventsourced-shopping-cart/README.md
+++ b/samples/ts/ts-eventsourced-shopping-cart/README.md
@@ -90,7 +90,7 @@ grpcurl --plaintext -d '{"cart_id": "cart1", "product_id": "kalix-tshirt"}' loca
 
 ## Deploying to Kalix
 
-To deploy your service, install the `kalix` CLI as documented in [Setting up a local development environment](https://docs.kalix.io/getting-started/set-up-development-env.html) and configure a Docker Registry to upload your docker image to.
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json` and refer to [Configuring registries](https://docs.kalix.io/projects/container-registries.html) for more information on how to make your docker image available to Kalix.
 
diff --git a/samples/ts/ts-replicated-entity-shopping-cart/README.md b/samples/ts/ts-replicated-entity-shopping-cart/README.md
index afc42910..f2fd081f 100644
--- a/samples/ts/ts-replicated-entity-shopping-cart/README.md
+++ b/samples/ts/ts-replicated-entity-shopping-cart/README.md
@@ -91,8 +91,7 @@ grpcurl --plaintext -d '{"cart_id": "cart1"}' localhost:9000 com.example.shoppin
 
 ## Deploying
 
-To deploy your service, install the `kalix` CLI as documented in [Setting up a local development
-environment](https://docs.kalix.io/getting-started/set-up-development-env.html) and
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and
 configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json` and refer to [Configuring
diff --git a/samples/ts/ts-shopping-cart-quickstart/README.md b/samples/ts/ts-shopping-cart-quickstart/README.md
index e489bc54..c3244bec 100644
--- a/samples/ts/ts-shopping-cart-quickstart/README.md
+++ b/samples/ts/ts-shopping-cart-quickstart/README.md
@@ -105,9 +105,7 @@ HTTP endpoint. Example calls using [grpcurl](https://github.com/fullstorydev/grp
 
 ## Deploying
 
-To deploy your service, install the `kalix` CLI as documented in [setting up a local development
-environment](https://docs.kalix.io/getting-started/set-up-development-env.html) and configure a
-Docker Registry to upload your docker image to.
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json`. Refer to
 [configuring registries](https://docs.kalix.io/projects/container-registries.html) for more
diff --git a/samples/ts/ts-valueentity-counter/README.md b/samples/ts/ts-valueentity-counter/README.md
index a61a0242..3a56b566 100644
--- a/samples/ts/ts-valueentity-counter/README.md
+++ b/samples/ts/ts-valueentity-counter/README.md
@@ -87,8 +87,7 @@ ERROR:
 ## Deploying
 
 To deploy your service, install the `kalix` CLI as documented in
-[Setting up a local development environment](https://docs.kalix.io/getting-started/set-up-development-env.html)
-and configure a Docker Registry to upload your docker image to.
+[Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json` and refer to
 [Configuring registries](https://docs.kalix.io/projects/container-registries.html)
diff --git a/samples/ts/ts-valueentity-shopping-cart/README.md b/samples/ts/ts-valueentity-shopping-cart/README.md
index 623fde1a..662eb1f0 100644
--- a/samples/ts/ts-valueentity-shopping-cart/README.md
+++ b/samples/ts/ts-valueentity-shopping-cart/README.md
@@ -87,9 +87,7 @@ grpcurl --plaintext -d '{"cart_id": "cart1"}' localhost:9000 com.example.shoppin
 
 ## Deploying
 
-To deploy your service, install the `kalix` CLI as documented in
-[Setting up a local development environment](https://docs.kalix.io/getting-started/set-up-development-env.html)
-and configure a Docker Registry to upload your docker image to.
+To deploy your service, install the `kalix` CLI as documented in [Install Kalix](https://docs.kalix.io/kalix/install-kalix.html) and configure a Docker Registry to upload your docker image to.
 
 You will need to update the `config.dockerImage` property in the `package.json` and refer to
 [Configuring registries](https://docs.kalix.io/projects/container-registries.html)