diff --git a/bitnami/wavefront-proxy/10/debian-10/Dockerfile b/bitnami/wavefront-proxy/10/debian-10/Dockerfile
index 3f0a3a44bea7..77447776f228 100644
--- a/bitnami/wavefront-proxy/10/debian-10/Dockerfile
+++ b/bitnami/wavefront-proxy/10/debian-10/Dockerfile
@@ -17,7 +17,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/wavefront-proxy/postunpack.sh
 ENV BITNAMI_APP_NAME="wavefront-proxy" \
-    BITNAMI_IMAGE_VERSION="10.8.0-debian-10-r7" \
+    BITNAMI_IMAGE_VERSION="10.8.0-debian-10-r8" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 2878
diff --git a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
index a8323db72d93..4265aae0a673 100644
--- a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -141,10 +141,51 @@ am_i_root() {
     if [[ "$(id -u)" = "0" ]]; then
         true
     else
-	false
+        false
     fi
 }
 
+########################
+# Print OS metadata
+# Arguments:
+#   $1 - Flag name
+# Flags:
+#   --id - Distro ID
+#   --version - Distro version
+#   --branch - Distro branch
+#   --codename - Distro codename
+# Returns:
+#   String
+#########################
+get_os_metadata() {
+    local -r flag_name="${1:?missing flag}"
+    # Helper function
+    get_os_release_metadata() {
+        local -r env_name="${1:?missing environment variable name}"
+        (
+            . /etc/os-release
+            echo "${!env_name}"
+        )
+    }
+    case "$flag_name" in
+        --id)
+            get_os_release_metadata ID
+            ;;
+        --version)
+            get_os_release_metadata VERSION_ID
+            ;;
+        --branch)
+            get_os_release_metadata VERSION_ID | sed 's/\..*//'
+            ;;
+        --codename)
+            get_os_release_metadata VERSION_CODENAME
+            ;;
+        *)
+            error "Unknown flag ${flag_name}"
+            return 1
+    esac
+}
+
 ########################
 # Get total memory available
 # Arguments:
diff --git a/bitnami/wavefront-proxy/README.md b/bitnami/wavefront-proxy/README.md
index 0bc306418b7f..28dbce080e7e 100644
--- a/bitnami/wavefront-proxy/README.md
+++ b/bitnami/wavefront-proxy/README.md
@@ -28,7 +28,7 @@ $ docker run --name wavefront-proxy bitnami/wavefront-proxy: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/).
 
 
-* [`10`, `10-debian-10`, `10.8.0`, `10.8.0-debian-10-r7`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wavefront-proxy/blob/10.8.0-debian-10-r7/10/debian-10/Dockerfile)
+* [`10`, `10-debian-10`, `10.8.0`, `10.8.0-debian-10-r8`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wavefront-proxy/blob/10.8.0-debian-10-r8/10/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wavefront-proxy GitHub repo](https://github.com/bitnami/bitnami-docker-wavefront-proxy).