diff --git a/docs/cluster-connectivity-setup/aiven-kafka-cluster-sasl-protocol.md b/docs/cluster-connectivity-setup/aiven-kafka-cluster-sasl-protocol.md
index c6f3b68c..be72f30e 100644
--- a/docs/cluster-connectivity-setup/aiven-kafka-cluster-sasl-protocol.md
+++ b/docs/cluster-connectivity-setup/aiven-kafka-cluster-sasl-protocol.md
@@ -11,7 +11,7 @@ Apache Kafka cluster with Klaw using the SASL_SSL authentication protocol.
   communicate.
 - A running Aiven for Apache Kafka service. See [Getting started with
   Aiven for Apache Kafka for more
-  information](https://docs.aiven.io/docs/products/kafka/getting-started.html).
+  information](https://aiven.io/docs/products/kafka#get-started-with-aiven-for-apache-kafka).
 - Configured [Java keystore and truststore containing the service SSL
   certificates](https://docs.aiven.io/docs/products/kafka/howto/keystore-truststore.html)
   to access Apache Kafka.
diff --git a/docs/cluster-connectivity-setup/aiven-kafka-cluster-ssl-protocol.md b/docs/cluster-connectivity-setup/aiven-kafka-cluster-ssl-protocol.md
index 8ff4b855..8c0881a8 100644
--- a/docs/cluster-connectivity-setup/aiven-kafka-cluster-ssl-protocol.md
+++ b/docs/cluster-connectivity-setup/aiven-kafka-cluster-ssl-protocol.md
@@ -13,7 +13,7 @@ cluster with Klaw using SSL authentication protocol.
   communicate.
 - A running Aiven for Apache Kafka service. See [Getting started with
   Aiven for Apache Kafka for more
-  information](https://docs.aiven.io/docs/products/kafka/getting-started.html).
+  information](https://aiven.io/docs/products/kafka#get-started-with-aiven-for-apache-kafka).
 - Configured [Java keystore and truststore containing the service SSL
   certificates](https://docs.aiven.io/docs/products/kafka/howto/keystore-truststore.html)
   to access Apache Kafka.
diff --git a/docs/releases/release240.md b/docs/releases/release240.md
index b90e2aa7..3ea772ac 100644
--- a/docs/releases/release240.md
+++ b/docs/releases/release240.md
@@ -98,4 +98,4 @@ frontend.
 
 :::note
 For a complete list of improvements, changelog, and to download the
-release, see [GitHub release tag v2.4.0](https://github.com/aiven/klaw/releases/tagv2.4.0)
+release, see [GitHub release tag v2.4.0](https://github.com/Aiven-Open/klaw/releases/tag/v2.4.0)
diff --git a/docs/releases/release270.md b/docs/releases/release270.md
index 8d4c4698..578d3aa9 100644
--- a/docs/releases/release270.md
+++ b/docs/releases/release270.md
@@ -16,13 +16,13 @@ kafka clients on schema changes
 
 ### Binaries
 
-[`klaw-2.7.0.jar` ⬇︎](https://github.com/Aiven-Open/klaw/releases/download/v.2.7.0/klaw-2.7.0.jar)
+[`klaw-2.7.0.jar` ⬇︎](https://github.com/Aiven-Open/klaw/releases/download/v2.7.0/klaw-2.7.0.jar)
 
-[`cluster-api-2.7.0.jar` ⬇](https://github.com/Aiven-Open/klaw/releases/download/v.2.7.0/cluster-api-2.7.0.jar)
+[`cluster-api-2.7.0.jar` ⬇](https://github.com/Aiven-Open/klaw/releases/download/v2.7.0/cluster-api-2.7.0.jar)
 
 ### Sources
 
-[`klaw-2.7.0.zip` ⬇](https://github.com/Aiven-Open/klaw/archive/refs/tags/v.2.7.0.zip)
+[`klaw-2.7.0.zip` ⬇](https://github.com/Aiven-Open/klaw/archive/refs/tags/v2.7.0.zip)
 
 ### Docker
 
diff --git a/docs/setup-configuration/klaw-api-ssl-with-kafka.md b/docs/setup-configuration/klaw-api-ssl-with-kafka.md
index f7c1eaf3..fa6b73c9 100644
--- a/docs/setup-configuration/klaw-api-ssl-with-kafka.md
+++ b/docs/setup-configuration/klaw-api-ssl-with-kafka.md
@@ -32,7 +32,7 @@ example, here's how to easily configure Klaw for use with an Aiven for Apache Ka
 first install the [Aiven client](https://github.com/aiven/aiven-client) CLI tool.
 
 1.  Start or navigate to your Aiven for Apache Kafka service. If you're doing this for the first time, you can find more
-    information [in the Aiven documentation](https://docs.aiven.io/docs/products/kafka/getting-started.html).
+    information [in the Aiven documentation](https://aiven.io/docs/products/kafka#get-started-with-aiven-for-apache-kafka).
 
 2.  Make a directory to store the certificates in, for example, `certs/`.