diff --git a/bitnami/golang/README.md b/bitnami/golang/README.md
index 073c7d5ba358..f3f60bc6f89e 100644
--- a/bitnami/golang/README.md
+++ b/bitnami/golang/README.md
@@ -17,7 +17,7 @@ $ docker run --name golang bitnami/golang:latest
 ### Docker Compose
 
 ```console
-$ curl -sSL https://raw.githubusercontent.com/bitnami/bitnami-docker-golang/master/docker-compose.yml > docker-compose.yml
+$ curl -sSL https://raw.githubusercontent.com/bitnami/containers/main/bitnami/golang/docker-compose.yml > docker-compose.yml
 $ docker-compose up -d
 ```
 
@@ -35,10 +35,10 @@ $ docker-compose up -d
 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/).
 
 
-* [`1.18`, `1.18-debian-11`, `1.18.4`, `1.18.4-debian-11-r7`, `latest` (1.18/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-golang/blob/1.18.4-debian-11-r7/1.18/debian-11/Dockerfile)
-* [`1.17`, `1.17-debian-11`, `1.17.12`, `1.17.12-debian-11-r6` (1.17/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-golang/blob/1.17.12-debian-11-r6/1.17/debian-11/Dockerfile)
+* [`1.18`, `1.18-debian-11`, `1.18.4`, `1.18.4-debian-11-r7`, `latest` (1.18/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.18/debian-11/Dockerfile)
+* [`1.17`, `1.17-debian-11`, `1.17.12`, `1.17.12-debian-11-r7` (1.17/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.17/debian-11/Dockerfile)
 
-Subscribe to project updates by watching the [bitnami/golang GitHub repo](https://github.com/bitnami/bitnami-docker-golang).
+Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).
 
 ## Get this image
 
@@ -54,10 +54,12 @@ To use a specific version, you can pull a versioned tag. You can view the [list
 $ docker pull bitnami/golang:[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/golang:latest 'https://github.com/bitnami/bitnami-docker-golang.git#master:1.18/debian-11'
+$ git clone https://github.com/bitnami/containers.git
+$ cd bitnami/APP/VERSION/OPERATING-SYSTEM
+$ docker build -t bitnami/APP:latest .
 ```
 
 ## Persisting your application
@@ -70,7 +72,7 @@ $ docker run \
     bitnami/golang:latest
 ```
 
-You can also do this with a minor change to the [`docker-compose.yml`](https://github.com/bitnami/bitnami-docker-golang/blob/master/docker-compose.yml) file present in this repository:
+You can also do this with a minor change to the [`docker-compose.yml`](https://github.com/bitnami/containers/blob/main/bitnami/golang/docker-compose.yml) file present in this repository:
 
 ```yaml
 golang:
@@ -165,17 +167,11 @@ $ docker run --name golang bitnami/golang:latest
 
 ## 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-golang/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-golang/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-golang/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