diff --git a/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile b/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile
index 0497d79cfb51..0b10037df783 100644
--- a/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile
+++ b/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile
@@ -15,6 +15,13 @@ RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stac
 
 FROM scratch
 
+LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
+      org.opencontainers.image.description="Application packaged by Bitnami" \
+      org.opencontainers.image.ref.name="0.9.9-scratch-r5" \
+      org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/wavefront-hpa-adapter" \
+      org.opencontainers.image.title="wavefront-hpa-adapter" \
+      org.opencontainers.image.vendor="VMware, Inc." \
+      org.opencontainers.image.version="0.9.9"
 COPY prebuildfs /
 COPY rootfs /
 COPY --from=builder /opt/bitnami/wavefront-hpa-adapter/bin/wavefront-adapter /wavefront-adapter
diff --git a/bitnami/wavefront-hpa-adapter/0/scratch/tags-info.yaml b/bitnami/wavefront-hpa-adapter/0/scratch/tags-info.yaml
new file mode 100644
index 000000000000..410a76f3fe2f
--- /dev/null
+++ b/bitnami/wavefront-hpa-adapter/0/scratch/tags-info.yaml
@@ -0,0 +1,5 @@
+rolling-tags:
+  - "0"
+  - "0-scratch"
+  - "0.9.9"
+  - "latest"
diff --git a/bitnami/wavefront-hpa-adapter/README.md b/bitnami/wavefront-hpa-adapter/README.md
index 7251cf4b13f7..5869226d808f 100644
--- a/bitnami/wavefront-hpa-adapter/README.md
+++ b/bitnami/wavefront-hpa-adapter/README.md
@@ -28,7 +28,7 @@ $ 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-r4`, `latest` (0/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile)
+* [`0`, `0-scratch`, `0.9.9`, `0.9.9-scratch-r5`, `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/containers GitHub repo](https://github.com/bitnami/containers).