diff --git a/content/en/academy/localstack-101/lesson-7/index.md b/content/en/academy/localstack-101/lesson-7/index.md
index 79da6d7929..531ce7fa2d 100644
--- a/content/en/academy/localstack-101/lesson-7/index.md
+++ b/content/en/academy/localstack-101/lesson-7/index.md
@@ -34,5 +34,5 @@ Witness firsthand how they empower developers in various scenarios, especially f
Further reading:
-- [Cloud Pods Documentation](https://docs.localstack.cloud/user-guide/cloud-pods/)
-- [Cloud Pods Browser](https://docs.localstack.cloud/user-guide/web-application/cloud-pods-browser/)
\ No newline at end of file
+- [Cloud Pods Documentation]({{< ref "user-guide/cloud-pods" >}})
+- [Cloud Pods Browser](https://docs.localstack.cloud/user-guide/web-application/cloud-pods-browser/)
diff --git a/content/en/tutorials/ecs-ecr-container-app/index.md b/content/en/tutorials/ecs-ecr-container-app/index.md
index 3fad332deb..f6f9f77f25 100644
--- a/content/en/tutorials/ecs-ecr-container-app/index.md
+++ b/content/en/tutorials/ecs-ecr-container-app/index.md
@@ -33,7 +33,7 @@ ECS tasks can pull container images from ECR repositories and are customizable u
## Prerequisites
- [LocalStack Pro](https://localstack.cloud/pricing/)
-- [awslocal](https://docs.localstack.cloud/integrations/aws-cli/#localstack-aws-cli-awslocal)
+- [awslocal](https://docs.localstack.cloud/user-guide/integrations/aws-cli/#localstack-aws-cli-awslocal)
- [Docker](https://docker.io/)
- [`cURL`](https://curl.se/download.html)
diff --git a/content/en/tutorials/elb-load-balancing/index.md b/content/en/tutorials/elb-load-balancing/index.md
index b99d3c8454..94c2d40b97 100644
--- a/content/en/tutorials/elb-load-balancing/index.md
+++ b/content/en/tutorials/elb-load-balancing/index.md
@@ -37,7 +37,7 @@ In this tutorial we focus on the Application Load Balancer (ALB), which operates
- LocalStack Pro
- [Serverless framework](https://www.serverless.com/framework/docs/getting-started/)
- [Node.js & `npm`](https://nodejs.org/en/download/)
-- [`awslocal`](https://docs.localstack.cloud/integrations/aws-cli/#localstack-aws-cli-awslocal)
+- [`awslocal`](https://docs.localstack.cloud/user-guide/integrations/aws-cli/#localstack-aws-cli-awslocal)
- `cURL` & `jq`
## Setup a Serverless project
diff --git a/content/en/tutorials/java-notification-app/index.md b/content/en/tutorials/java-notification-app/index.md
index 0bd58b224d..3f06314832 100644
--- a/content/en/tutorials/java-notification-app/index.md
+++ b/content/en/tutorials/java-notification-app/index.md
@@ -41,7 +41,7 @@ For this tutorial, you will need:
- [LocalStack Pro](https://localstack.cloud/pricing/) to emulate the AWS services (SNS, SQS, SES, etc) locally
- Don't worry, if you don't have a subscription yet, you can just get a trial license for free.
-- [awslocal](https://docs.localstack.cloud/integrations/aws-cli/#localstack-aws-cli-awslocal)
+- [awslocal](https://docs.localstack.cloud/user-guide/integrations/aws-cli/#localstack-aws-cli-awslocal)
- [Docker](https://docker.io/)
- Java 11+
- Maven 3+
diff --git a/content/en/tutorials/lambda-ecr-container-images/index.md b/content/en/tutorials/lambda-ecr-container-images/index.md
index c2678e96ec..4976f6afa3 100644
--- a/content/en/tutorials/lambda-ecr-container-images/index.md
+++ b/content/en/tutorials/lambda-ecr-container-images/index.md
@@ -34,7 +34,7 @@ leadimage: "lambda-ecr-container-images-featured-image.png"
Before diving into this tutorial, make sure you have the following prerequisites:
- LocalStack Pro
-- [`awslocal` CLI](https://docs.localstack.cloud/integrations/aws-cli/#localstack-aws-cli-awslocal)
+- [`awslocal` CLI](https://docs.localstack.cloud/user-guide/integrations/aws-cli/#localstack-aws-cli-awslocal)
- [Python](https://www.python.org/downloads/)
- [Docker](https://docker.io/)
diff --git a/content/en/tutorials/reproducible-machine-learning-cloud-pods/index.md b/content/en/tutorials/reproducible-machine-learning-cloud-pods/index.md
index 516a4fc8d8..8fd3cc702f 100644
--- a/content/en/tutorials/reproducible-machine-learning-cloud-pods/index.md
+++ b/content/en/tutorials/reproducible-machine-learning-cloud-pods/index.md
@@ -44,7 +44,7 @@ We will then create a Cloud Pod to save the state of our LocalStack instance and
For this tutorial, you will need the following:
- [LocalStack Pro](https://localstack.cloud/pricing/)
-- [`awslocal` CLI](https://docs.localstack.cloud/integrations/aws-cli/#localstack-aws-cli-awslocal)
+- [`awslocal` CLI](https://docs.localstack.cloud/user-guide/integrations/aws-cli/#localstack-aws-cli-awslocal)
- [Optical recognition of handwritten digits dataset](https://archive.ics.uci.edu/ml/datasets/Optical+Recognition+of+Handwritten+Digits)
If you don't have a subscription to LocalStack Pro, you can request a trial license upon sign-up. For this tutorial to work, you must have the LocalStack CLI installed, which must be version 1.3 or higher. The Cloud Pods CLI is shipped with the LocalStack CLI, so you don't need to install it separately.
diff --git a/content/en/tutorials/schema-evolution-glue-msk/index.md b/content/en/tutorials/schema-evolution-glue-msk/index.md
index dc0fbeb031..d6f42eaa59 100644
--- a/content/en/tutorials/schema-evolution-glue-msk/index.md
+++ b/content/en/tutorials/schema-evolution-glue-msk/index.md
@@ -25,7 +25,7 @@ leadimage: "schema-evolution-glue-msk-featured-image.png"
[Apache Kafka](https://kafka.apache.org/) is an open-source distributed event store and stream-processing platform. It is used to capture data generated by producers and distribute it among its consumers. Kafka is known for its scalability, with reports of production environments scaling to [trillions of messages per day](https://engineering.linkedin.com/blog/2019/apache-kafka-trillion-messages). With [Amazon Managed Streaming for Apache Kafka (MSK)](https://aws.amazon.com/msk/), AWS provides a service to provision Apache Kafka clusters easily.
-[LocalStack Pro](https://app.localstack.cloud/) supports [Amazon Managed Streaming for Kafka (MSK)](https://docs.localstack.cloud/aws/managed-streaming-for-kafka/), which enables you to spin up Kafka clusters on your local machine and test the integration of your applications with Amazon MSK.
+[LocalStack Pro](https://app.localstack.cloud/) supports [Amazon Managed Streaming for Kafka (MSK)](https://docs.localstack.cloud/user-guide/aws/managed-streaming-for-kafka/), which enables you to spin up Kafka clusters on your local machine and test the integration of your applications with Amazon MSK.
Kafka clusters are often used as the central messaging infrastructure in complex microservice environments.
However, the continuous and independent development of the individual microservices - the data producers and consumers - can make it hard to coordinate and evolve data schemas over time without introducing application failures due to incompatibilities. A common solution to this problem is to use a schema registry which provides for the validation of schema changes, preventing any unsafe changes and subsequent application failures.
@@ -46,7 +46,7 @@ The following chart shows the integration of producers and consumers with Amazon
3. The consumer reads the serialized and compressed record.
4. The consumer requests the schema from the schema registry (if it is not already cached) and uses the schema to decompress and deserialize the record.
-[AWS Glue Schema Registry](https://docs.localstack.cloud/aws/glue/) is supported by LocalStack Pro as well, ultimately allowing you to test the evolution of your data streaming application completely on your local machine. It allows you develop and test your application's data schema evolution locally. The code for this tutorial (including a script to execute it step-by-step) can be found in our [LocalStack Pro samples over GitHub](https://github.com/localstack/localstack-pro-samples/tree/master/glue-msk-schema-registry).
+[AWS Glue Schema Registry](https://docs.localstack.cloud/user-guide/aws/glue/) is supported by LocalStack Pro as well, ultimately allowing you to test the evolution of your data streaming application completely on your local machine. It allows you develop and test your application's data schema evolution locally. The code for this tutorial (including a script to execute it step-by-step) can be found in our [LocalStack Pro samples over GitHub](https://github.com/localstack/localstack-pro-samples/tree/master/glue-msk-schema-registry).
# Prerequisites
@@ -54,7 +54,7 @@ For this tutorial you will need:
- [LocalStack Pro](https://localstack.cloud/pricing/) to emulate Amazon MSK and AWS Glue Schema Registry locally
- Don't worry, if you don't have a subscription yet, you can just get a trial license for free.
-- [awslocal](https://docs.localstack.cloud/integrations/aws-cli/#localstack-aws-cli-awslocal)
+- [awslocal](https://docs.localstack.cloud/user-guide/integrations/aws-cli/#localstack-aws-cli-awslocal)
- Java 11+
- Maven 3
diff --git a/content/en/user-guide/chaos-engineering/fis-experiments/index.md b/content/en/user-guide/chaos-engineering/fis-experiments/index.md
index f0a7035ca2..2ce452252f 100644
--- a/content/en/user-guide/chaos-engineering/fis-experiments/index.md
+++ b/content/en/user-guide/chaos-engineering/fis-experiments/index.md
@@ -15,14 +15,14 @@ and monitoring their effects, enabling developers to proactively prepare for rea
This guide is designed for users new to the Fault Injection Simulator and assumes basic knowledge of the AWS CLI and our
[`awslocal`](https://github.com/localstack/awscli-local) wrapper script. To read extensively about the FIS service, please
-refer to the dedicated [documentation page](/user-guide/aws/fis/).
+refer to the dedicated [documentation page](https://docs.localstack.cloud/user-guide/aws/fis/).
In this example of utilizing AWS Fault Injection Simulator (FIS) to cause controlled outages to a DynamoDB database we will
demonstrate testing software behavior and error handling. This kind of test helps to ensure that the software can handle
database downtime gracefully by implementing strategies such as queuing requests to prevent data loss. This proactive error
handling ensures that the system can maintain its operations despite partial failures. You can follow along with the full solution
-in this GitHub [repository](https://github.com/localstack-samples/samples-chaos-engineering/tree/main/FIS-experiments).
+in this GitHub [repository]().
Start LocalStack using the `docker-compose.yml` file from the repository and make sure you provide your API key as an environment
variable:
diff --git a/content/en/user-guide/chaos-engineering/outages-extension/index.md b/content/en/user-guide/chaos-engineering/outages-extension/index.md
index 3be60d9fb9..287eceae9f 100644
--- a/content/en/user-guide/chaos-engineering/outages-extension/index.md
+++ b/content/en/user-guide/chaos-engineering/outages-extension/index.md
@@ -15,7 +15,7 @@ verifying the reliability of infrastructure as code (IaC) and automated provisio
## Getting started
In this example we will be using a popular IaC tool, Terraform, to define our desired infrastructure in a declarative manner.
-To follow along, please refer to this use-case dedicated [repository](https://github.com/localstack-samples/samples-chaos-engineering/tree/main/extension-outages).
+To follow along, please refer to this use-case dedicated [repository]().
To get started with observing Terraform's behavior during partial outages, you would begin by writing a basic Terraform
configuration file that defines the required cloud resources, such as virtual machines, networks, or databases on AWS.
diff --git a/content/en/user-guide/chaos-engineering/route53-failover/index.md b/content/en/user-guide/chaos-engineering/route53-failover/index.md
index 49bba92286..f4e4e8628e 100644
--- a/content/en/user-guide/chaos-engineering/route53-failover/index.md
+++ b/content/en/user-guide/chaos-engineering/route53-failover/index.md
@@ -17,7 +17,7 @@ It's a strategic safeguard, integral for maintaining seamless user experiences u
This guide is designed for users new to the Route53 and FIS services and assumes basic knowledge of the AWS CLI and our
[`awslocal`](https://github.com/localstack/awscli-local) wrapper script. To read extensively about the FIS service, please
-refer to the dedicated [documentation page](/user-guide/aws/fis/) and [here](/user-guide/aws/route53/) for Route53.
+refer to the dedicated [documentation page](https://docs.localstack.cloud/user-guide/aws/fis/) and [here](https://docs.localstack.cloud/user-guide/aws/route53/) for Route53.
In this example we have an AWS-based architecture with an active-primary and passive-standby setup. Route53
directs traffic to the primary region, which handles product-related requests via API Gateway and Lambda functions,
diff --git a/content/en/user-guide/chaos-engineering/subsequent-configs/index.md b/content/en/user-guide/chaos-engineering/subsequent-configs/index.md
index 6344bf3407..2c671fc73d 100644
--- a/content/en/user-guide/chaos-engineering/subsequent-configs/index.md
+++ b/content/en/user-guide/chaos-engineering/subsequent-configs/index.md
@@ -15,7 +15,7 @@ architecture remains robust under adverse conditions with minimal upfront config
This guide is designed for demonstrating the `DYNAMODB_ERROR_PROBABILITY` and `KINESIS_ERROR_PROBABILITY` configuration flags
and assumes basic knowledge of the AWS CLI and our [`awslocal`](https://github.com/localstack/awscli-local) wrapper script.
-To find out more about all the configuration possibilities please refer to the dedicated [documentation page](/references/configuration/).
+To find out more about all the configuration possibilities please refer to the dedicated [documentation page](https://docs.localstack.cloud/references/configuration/).
## Kinesis Error Probability
diff --git a/content/en/user-guide/ci/_index.md b/content/en/user-guide/ci/_index.md
index 84980760df..10286bd249 100644
--- a/content/en/user-guide/ci/_index.md
+++ b/content/en/user-guide/ci/_index.md
@@ -19,7 +19,7 @@ Let's assume that your team has an automated CI workflow into which you want to
{{< figure src="localstack-in-ci.svg" alt="An example CI/CD workflow using LocalStack" width="90%">}}
-The CI build is triggered by pushing code to a version control repository, like GitHub. The CI runner starts LocalStack and executes the test suite. You can also use the same Infrastructure-as-Code (IaC) configuration that you use to set up AWS in your production environment to set up LocalStack in the CI environment. You can also pre-seed state into the local AWS services (e.g., DynamoDB entries or S3 files) provided by LocalStack in your CI environment via [Cloud Pods](https://docs.localstack.cloud/tools/cloud-pods/).
+The CI build is triggered by pushing code to a version control repository, like GitHub. The CI runner starts LocalStack and executes the test suite. You can also use the same Infrastructure-as-Code (IaC) configuration that you use to set up AWS in your production environment to set up LocalStack in the CI environment. You can also pre-seed state into the local AWS services (e.g., DynamoDB entries or S3 files) provided by LocalStack in your CI environment via [Cloud Pods]({{< ref "user-guide/cloud-pods/" >}}).
After a successful test run, you can execute the more expensive AWS CodeBuild pipeline for deploying your application. You can enrich the test reports created by your testing framework with traces and analytics generated inside LocalStack.
diff --git a/content/en/user-guide/web-application/cloud-pods-browser/index.md b/content/en/user-guide/web-application/cloud-pods-browser/index.md
index d667882459..70b5776ee2 100644
--- a/content/en/user-guide/web-application/cloud-pods-browser/index.md
+++ b/content/en/user-guide/web-application/cloud-pods-browser/index.md
@@ -9,20 +9,20 @@ description: >
[The Cloud Pods Browser](https://app.localstack.cloud/pods) lets you access and manage all your Cloud Pods. The Cloud Pods Browser is a feature of our LocalStack Web Application that is exclusive to **LocalStack Team & Enterprise users**.
With Cloud Pods, you can have individual or shared ownership of a snapshot of your LocalStack instance.
-The LocalStack CLI allows you to create new Cloud Pods and configure their [visibility settings](https://docs.localstack.cloud/user-guide/cloud-pods/pods-cli/#save).
+The LocalStack CLI allows you to create new Cloud Pods and configure their [visibility settings](https://docs.localstack.cloud/user-guide/tools/cloud-pods/pods-cli/).
## Usage
-You can use [Cloud Pods](https://docs.localstack.cloud/user-guide/cloud-pods/) to manage your local AWS infrastructure and collaborate with others:
+You can use [Cloud Pods]({{< ref "user-guide/cloud-pods/" >}}) to manage your local AWS infrastructure and collaborate with others:
- Cloud Pods are accessible to all LocalStack Team users in your organization namespace. Public Cloud Pods are accessible to all LocalStack users.
- Cloud Pods version history is available, which allows you to view the version history of a Cloud Pod and access previous versions of specific Cloud Pods.
- Cloud Pods can be made public, injected into a running LocalStack container, or deleted - all from the LocalStack Web Application.
{{< alert title="Warning" color="warning">}}
-LocalStack Pro users cannot access the Cloud Pods Browser. Community & Pro users can use the [Community Cloud Pods](https://docs.localstack.cloud/user-guide/cloud-pods/community/) and save their Cloud Pods locally or share them via a GitHub/GitLab repository. The [Cloud Pods launchpad](https://docs.localstack.cloud/user-guide/cloud-pods/launchpad/) can be used to inject a Cloud Pod into a running LocalStack container through a simple click.
+LocalStack Pro users cannot access the Cloud Pods Browser. Community & Pro users can use the [Community Cloud Pods]({{< ref "user-guide/cloud-pods/community" >}}) and save their Cloud Pods locally or share them via a GitHub/GitLab repository. The [Cloud Pods launchpad]({{< ref "user-guide/cloud-pods/launchpad" >}}) can be used to inject a Cloud Pod into a running LocalStack container through a simple click.
{{< /alert >}}
## Access the version history
@@ -31,7 +31,7 @@ To view the version history of a Cloud Pod, click on the Cloud Pod's name in the
-To create a new version of a Cloud Pod, refer to the [Cloud Pods CLI](https://docs.localstack.cloud/user-guide/cloud-pods/pods-cli/#save) documentation.
+To create a new version of a Cloud Pod, refer to the [Cloud Pods CLI](https://docs.localstack.cloud/user-guide/tools/cloud-pods/pods-cli/) documentation.
## Save a Cloud Pod