diff --git a/bitnami/sonarqube/9/debian-11/Dockerfile b/bitnami/sonarqube/9/debian-11/Dockerfile
index 1382962190e2..b47936010fca 100644
--- a/bitnami/sonarqube/9/debian-11/Dockerfile
+++ b/bitnami/sonarqube/9/debian-11/Dockerfile
@@ -7,20 +7,44 @@ ENV HOME="/" \
 ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="9.5.0-debian-11-r12" \
+      org.opencontainers.image.ref.name="9.6.1-debian-11-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/sonarqube" \
       org.opencontainers.image.title="sonarqube" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="9.5.0"
+      org.opencontainers.image.version="9.6.1"
 
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libbsd0 libc6 libedit2 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 procps tar zlib1g
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql-client" "13.8.0-1" --checksum ed27577fe07511a7ff3ba58800604c463387cdd21fb3f64473e75f327b73565d
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.15-1-3" --checksum 7214b8ab81c9d919f87f027590ca80c198f65fe50c5e2886d8e5e20691aee8d7
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "sonarqube" "9.5.0-6" --checksum e56cc631b3212e03538a89fa192146c1b5bdc0cecb9f5cd6967b15622552909d
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-154" --checksum e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f postgresql-client-13.8.0-1-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/postgresql-client-13.8.0-1-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "ed27577fe07511a7ff3ba58800604c463387cdd21fb3f64473e75f327b73565d  postgresql-client-13.8.0-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf postgresql-client-13.8.0-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf postgresql-client-13.8.0-1-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f java-11.0.15-1-3-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-11.0.15-1-3-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "7214b8ab81c9d919f87f027590ca80c198f65fe50c5e2886d8e5e20691aee8d7  java-11.0.15-1-3-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf java-11.0.15-1-3-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf java-11.0.15-1-3-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f sonarqube-9.6.1-0-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/sonarqube-9.6.1-0-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "4303d93c851888ddc9be5f16e5455b804e5d684495aadcedb9c12149af53fe67  sonarqube-9.6.1-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf sonarqube-9.6.1-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf sonarqube-9.6.1-0-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab  gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
@@ -28,7 +52,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/sonarqube/postunpack.sh
-ENV APP_VERSION="9.5.0" \
+ENV APP_VERSION="9.6.1" \
     BITNAMI_APP_NAME="sonarqube" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
diff --git a/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 2c28398178cc..0f3e93e9761f 100644
--- a/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -22,9 +22,9 @@
     },
     "sonarqube": {
         "arch": "amd64",
-        "digest": "e56cc631b3212e03538a89fa192146c1b5bdc0cecb9f5cd6967b15622552909d",
+        "digest": "4303d93c851888ddc9be5f16e5455b804e5d684495aadcedb9c12149af53fe67",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "9.5.0-6"
+        "version": "9.6.1-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
deleted file mode 100644
index a7b60696daa6..000000000000
--- a/bitnami/sonarqube/9/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-# Library for managing Bitnami components
-
-# Constants
-CACHE_ROOT="/tmp/bitnami/pkg/cache"
-DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith"
-
-# Functions
-
-########################
-# Download and unpack a Bitnami package
-# Globals:
-#   OS_NAME
-#   OS_ARCH
-#   OS_FLAVOUR
-# Arguments:
-#   $1 - component's name
-#   $2 - component's version
-# Returns:
-#   None
-#########################
-component_unpack() {
-    local name="${1:?name is required}"
-    local version="${2:?version is required}"
-    local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}"
-    local package_sha256=""
-    local directory="/opt/bitnami"
-
-    # Validate arguments
-    shift 2
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -c|--checksum)
-                shift
-                package_sha256="${1:?missing package checksum}"
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    echo "Downloading $base_name package"
-    if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then
-        echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download."
-        cp "${CACHE_ROOT}/${base_name}.tar.gz" .
-        rm "${CACHE_ROOT}/${base_name}.tar.gz"
-        if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then
-            echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256"
-            package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")"
-            rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256"
-        fi
-    else
-	curl --remote-name --silent --show-error --fail "${DOWNLOAD_URL}/${base_name}.tar.gz"
-    fi
-    if [ -n "$package_sha256" ]; then
-        echo "Verifying package integrity"
-        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 || return "$?"
-    rm "${base_name}.tar.gz"
-}
diff --git a/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/sonarqube/postunpack.sh b/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/sonarqube/postunpack.sh
index 4bdc93d4174b..f6d5bdb89c2d 100755
--- a/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/sonarqube/postunpack.sh
+++ b/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/sonarqube/postunpack.sh
@@ -17,15 +17,21 @@ set -o pipefail
 . /opt/bitnami/scripts/liblog.sh
 
 info "Updating PID files location"
+# PIDDIR appears in branch 8 
 replace_in_file "${SONARQUBE_BIN_DIR}/sonar.sh" "PIDDIR=\"\.\"" "PIDDIR=\"../../pids\""
+# PIDFile appears in branch 9
+replace_in_file "${SONARQUBE_BIN_DIR}/sonar.sh" "PIDFILE=\".*" "PIDFILE=\"/opt/bitnami/sonarqube/pids/\$APP_NAME.pid\""
 
-info "Updating log file location"
-replace_in_file "${SONARQUBE_CONF_DIR}/wrapper.conf" "\.\./\.\./sonar\.YYYYMMDD\.log" "../../sonar.log"
+# The file wrapper.conf only exist in branch 8.
+if [[ -f "${SONARQUBE_CONF_DIR}/wrapper.conf" ]]; then
+    info "Updating log file location"
+    replace_in_file "${SONARQUBE_CONF_DIR}/wrapper.conf" "\.\./\.\./sonar\.YYYYMMDD\.log" "../../sonar.log"
 
-# Log rotation will be handled externally
-# Refer to "Log Rotation" section in https://docs.sonarqube.org/latest/instance-administration/system-info/
-info "Disabling log rolling"
-replace_in_file "${SONARQUBE_CONF_DIR}/wrapper.conf" "^[#\s]*wrapper.logfile.rollmode\s*=.*" "wrapper.logfile.rollmode=NONE"
+    # Log rotation will be handled externally
+    # Refer to "Log Rotation" section in https://docs.sonarqube.org/latest/instance-administration/system-info/
+    info "Disabling log rolling"
+    replace_in_file "${SONARQUBE_CONF_DIR}/wrapper.conf" "^[#\s]*wrapper.logfile.rollmode\s*=.*" "wrapper.logfile.rollmode=NONE"
+fi
 
 # Ensure the SonarQube base directory exists and has proper permissions
 # Based on https://github.com/SonarSource/docker-sonarqube/blob/master/9/community/Dockerfile#L129
diff --git a/bitnami/sonarqube/9/debian-11/tags-info.yaml b/bitnami/sonarqube/9/debian-11/tags-info.yaml
index 0006e4e8fcfc..58d1ed2328d6 100644
--- a/bitnami/sonarqube/9/debian-11/tags-info.yaml
+++ b/bitnami/sonarqube/9/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
   - "9"
   - "9-debian-11"
-  - "9.5.0"
+  - "9.6.1"
   - "latest"
diff --git a/bitnami/sonarqube/README.md b/bitnami/sonarqube/README.md
index 053a93347352..5ba5e67ec212 100644
--- a/bitnami/sonarqube/README.md
+++ b/bitnami/sonarqube/README.md
@@ -35,7 +35,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-- [`9`, `9-debian-11`, `9.5.0`, `9.5.0-debian-11-r12`, `latest` (9/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/sonarqube/9/debian-11/Dockerfile)
+- [`9`, `9-debian-11`, `9.6.1`, `9.6.1-debian-11-r0`, `latest` (9/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/sonarqube/9/debian-11/Dockerfile)
 - [`8`, `8-debian-11`, `8.9.9`, `8.9.9-debian-11-r22` (8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/sonarqube/8/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).