diff --git a/bitnami/nats/README.md b/bitnami/nats/README.md
index 3d7d31d88d67..af6afd1595d6 100644
--- a/bitnami/nats/README.md
+++ b/bitnami/nats/README.md
@@ -17,7 +17,7 @@ $ docker run -it --name nats bitnami/nats
 ### Docker Compose
 
 ```console
-$ curl -LO https://raw.githubusercontent.com/bitnami/bitnami-docker-nats/master/docker-compose.yml
+$ curl -LO https://raw.githubusercontent.com/bitnami/containers/main/bitnami/nats/docker-compose.yml
 $ docker-compose up
 ```
 
@@ -45,9 +45,9 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`2`, `2-debian-11`, `2.8.4`, `2.8.4-debian-11-r21`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-nats/blob/2.8.4-debian-11-r21/2/debian-11/Dockerfile)
+* [`2`, `2-debian-11`, `2.8.4`, `2.8.4-debian-11-r22`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/nats/2/debian-11/Dockerfile)
 
-Subscribe to project updates by watching the [bitnami/nats GitHub repo](https://github.com/bitnami/bitnami-docker-nats).
+Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).
 
 ## Prerequisites
 
@@ -69,10 +69,12 @@ in the Docker Hub Registry.
 $ docker pull bitnami/nats:[TAG]
 ```
 
-If you wish, you can also build the image yourself.
+If you wish, you can also build the image yourself by cloning the repository, changing to the directory containing the Dockerfile and executing the `docker build` command. Remember to replace the `APP`, `VERSION` and `OPERATING-SYSTEM` path placeholders in the example command below with the correct values.
 
 ```console
-$ docker build -t bitnami/nats:latest 'https://github.com/bitnami/bitnami-docker-nginx.git#master:2/debian-11'
+$ git clone https://github.com/bitnami/containers.git
+$ cd bitnami/APP/VERSION/OPERATING-SYSTEM
+$ docker build -t bitnami/APP:latest .
 ```
 
 ## Connecting to other containers
@@ -170,7 +172,7 @@ $ docker-compose up -d
 
 When you start the NATS image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line. If you want to add a new environment variable:
 
-* For docker-compose add the variable name and value under the application section in the [`docker-compose.yml`](https://github.com/bitnami/bitnami-docker-nats/blob/master/docker-compose.yml) file present in this repository:
+* For docker-compose add the variable name and value under the application section in the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/nats/docker-compose.yml) file present in this repository:
 
 ```yaml
 nats:
@@ -234,7 +236,7 @@ $ docker run -d --name nats -p 4222:4222 -p 6222:6222 -p 8222:8222 \
 
 #### Using Docker Compose
 
-Modify the [`docker-compose.yml`](https://github.com/bitnami/bitnami-docker-nats/blob/master/docker-compose.yml) file present in this repository as follows:
+Modify the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/nats/docker-compose.yml) file present in this repository as follows:
 
 ```diff
 ...
@@ -259,17 +261,11 @@ For further documentation, please check [NATS documentation](https://docs.nats.i
 
 ## Contributing
 
-We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/bitnami-docker-nats/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-nats/pulls) with your contribution.
+We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues), or submit a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.
 
 ## Issues
 
-If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/bitnami-docker-nats/issues/new). For us to provide better support, be sure to include the following information in your issue:
-
-- Host OS and version
-- Docker version (`docker version`)
-- Output of `docker info`
-- Version of this container
-- The command you used to run the container, and any relevant output you saw (masking any sensitive information)
+If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/containers/issues/new/choose). For us to provide better support, be sure to fill the issue template.
 
 ## License