diff --git a/bitnami/wavefront-hpa-adapter/README.md b/bitnami/wavefront-hpa-adapter/README.md
index 9597f9d32bb9..1b56277a4fd1 100644
--- a/bitnami/wavefront-hpa-adapter/README.md
+++ b/bitnami/wavefront-hpa-adapter/README.md
@@ -28,9 +28,9 @@ $ docker run --name wavefront-hpa-adapter bitnami/wavefront-hpa-adapter:latest
 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/).
 
 
-* [`0`, `0-scratch`, `0.9.9`, `0.9.9-scratch-r1`, `latest` (0/scratch/Dockerfile)](https://github.com/bitnami/bitnami-docker-wavefront-hpa-adapter/blob/0.9.9-scratch-r1/0/scratch/Dockerfile)
+* [`0`, `0-scratch`, `0.9.9`, `0.9.9-scratch-r2`, `latest` (0/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile)
 
-Subscribe to project updates by watching the [bitnami/wavefront-hpa-adapter GitHub repo](https://github.com/bitnami/bitnami-docker-wavefront-hpa-adapter).
+Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).
 
 ## Get this image
 
@@ -46,10 +46,12 @@ To use a specific version, you can pull a versioned tag. You can view the [list
 $ docker pull bitnami/wavefront-hpa-adapter:[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/wavefront-hpa-adapter:latest 'https://github.com/bitnami/bitnami-docker-wavefront-hpa-adapter.git#master:0/scratch'
+$ git clone https://github.com/bitnami/containers.git
+$ cd bitnami/APP/VERSION/OPERATING-SYSTEM
+$ docker build -t bitnami/APP:latest .
 ```
 
 ## Why use a non-root container?
@@ -70,17 +72,11 @@ Check the [official Wavefront HPA Adapter for Kubernetes documentation](https://
 
 ## 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-wavefront-hpa-adapter/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-wavefront-hpa-adapter/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-wavefront-hpa-adapter/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