diff --git a/bitnami/sonarqube/8/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/sonarqube/8/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
index e3098a93b7c0..a7b60696daa6 100644
--- a/bitnami/sonarqube/8/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
+++ b/bitnami/sonarqube/8/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
@@ -58,8 +58,8 @@ component_unpack() {
     fi
     if [ -n "$package_sha256" ]; then
         echo "Verifying package integrity"
-        echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check - || exit "$?"
+        echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check - || return "$?"
     fi
-    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2
+    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 || return "$?"
     rm "${base_name}.tar.gz"
 }
diff --git a/bitnami/sonarqube/README.md b/bitnami/sonarqube/README.md
index 105e9d660c12..d9eb41912403 100644
--- a/bitnami/sonarqube/README.md
+++ b/bitnami/sonarqube/README.md
@@ -36,7 +36,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 - [`9`, `9-debian-11`, `9.4.0`, `9.4.0-debian-11-r4`, `latest` (9/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-sonarqube/blob/9.4.0-debian-11-r4/9/debian-11/Dockerfile)
-- [`8`, `8-debian-11`, `8.9.8`, `8.9.8-debian-11-r4` (8/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-sonarqube/blob/8.9.8-debian-11-r4/8/debian-11/Dockerfile)
+- [`8`, `8-debian-11`, `8.9.8`, `8.9.8-debian-11-r5` (8/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-sonarqube/blob/8.9.8-debian-11-r5/8/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/sonarqube GitHub repo](https://github.com/bitnami/bitnami-docker-sonarqube).