diff --git a/bitnami/percona-mysql/5.7/debian-11/Dockerfile b/bitnami/percona-mysql/5.7/debian-11/Dockerfile
index 0c1e351db09c..d6c31feab02d 100644
--- a/bitnami/percona-mysql/5.7/debian-11/Dockerfile
+++ b/bitnami/percona-mysql/5.7/debian-11/Dockerfile
@@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-14T15:07:03Z" \
+      org.opencontainers.image.created="2023-03-22T03:17:26Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="5.7.41-44-debian-11-r4" \
+      org.opencontainers.image.ref.name="5.7.41-44-debian-11-r5" \
       org.opencontainers.image.title="percona-mysql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="5.7.41-44"
@@ -22,11 +22,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libaio1 libaudit1 libbrotli1 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libev4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblz4-1 liblzma5 libnettle8 libnghttp2-14 libnuma-dev libp11-kit0 libpam0g libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libsystemd0 libtasn1-6 libunistring2 libuuid1 libzstd1 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "percona-xtrabackup-binary-8.0.30-23-2-linux-${OS_ARCH}-debian-11" \
-      "ini-file-1.4.5-1-linux-${OS_ARCH}-debian-11" \
-      "percona-mysql-5.7.41-44-0-linux-${OS_ARCH}-debian-11" \
-      "mysql-shell-8.0.31-3-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
+      "percona-xtrabackup-binary-8.0.30-23-3-linux-${OS_ARCH}-debian-11" \
+      "ini-file-1.4.5-2-linux-${OS_ARCH}-debian-11" \
+      "percona-mysql-5.7.41-44-1-linux-${OS_ARCH}-debian-11" \
+      "mysql-shell-8.0.31-4-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/percona-mysql/5.7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/percona-mysql/5.7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index f3e34076c99e..01fe2c6e6a38 100644
--- a/bitnami/percona-mysql/5.7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/percona-mysql/5.7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,37 +1,37 @@
 {
     "gosu": {
         "arch": "amd64",
-        "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa",
+        "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.16.0-2"
+        "version": "1.16.0-3"
     },
     "ini-file": {
         "arch": "amd64",
-        "digest": "75d5f74f62ca3a476e5ffc01715b197ba18c3b45a85b18fb61cc68e998616119",
+        "digest": "c75066994058575c6092fb760bd53feeb2aabd6039e942f3904de57f5a5534dc",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.4.5-1"
+        "version": "1.4.5-2"
     },
     "mysql-shell": {
         "arch": "amd64",
-        "digest": "4635f1393c0998f3a528b641244a0e7ea08498c85f7499f3943b390814233387",
+        "digest": "a360a5c73d7610f0e5629c9deab83cc0ab903216dd3923959006eb5d8a2036e8",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.0.31-3"
+        "version": "8.0.31-4"
     },
     "percona-mysql": {
         "arch": "amd64",
-        "digest": "476f2eb03397a5ebf5765e106007e9c90aca43e6270ba1e78c2fc1cc75bce1be",
+        "digest": "41d6a1cc6a8f6908f328f8bcf9fd132ef830fb3722d4f2f5f544348b4905cbe5",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "5.7.41-44-0"
+        "version": "5.7.41-44-1"
     },
     "percona-xtrabackup-binary": {
         "arch": "amd64",
-        "digest": "d51606d184561be47d081ac39851c14cfc8cade39127bfba89b5fb11f7eb9149",
+        "digest": "72d73637fea1dc52d14938cd8ced767f33509c76c726b52f5000434b34202430",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.0.30-23-2"
+        "version": "8.0.30-23-3"
     }
 }
\ No newline at end of file
diff --git a/bitnami/percona-mysql/5.7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/percona-mysql/5.7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index 2d53aca9af84..2d4b7af6fd3a 100644
--- a/bitnami/percona-mysql/5.7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/percona-mysql/5.7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -281,6 +281,8 @@ remove_logrotate_conf() {
 #   --environment - Environment variable to define (multiple --environment options may be passed)
 #   --environment-file - Text file with environment variables
 #   --exec-start - Start command (required)
+#   --exec-start-pre - Pre-start command (optional)
+#   --exec-start-post - Post-start command (optional)
 #   --exec-stop - Stop command (optional)
 #   --exec-reload - Reload command (optional)
 #   --group - System group to start the service with
@@ -292,6 +294,7 @@ remove_logrotate_conf() {
 #   --success-exit-status - Exit code that indicates a successful shutdown
 #   --type - Systemd unit type (defaults to forking)
 #   --user - System user to start the service with
+#   --working-directory - Working directory at which to start the service
 # Returns:
 #   None
 #########################
@@ -307,6 +310,8 @@ generate_systemd_conf() {
     local environment=""
     local environment_file=""
     local exec_start=""
+    local exec_start_pre=""
+    local exec_start_post=""
     local exec_stop=""
     local exec_reload=""
     local restart="always"
@@ -316,6 +321,7 @@ generate_systemd_conf() {
     local limits_content=""
     local success_exit_status=""
     local custom_service_content=""
+    local working_directory=""
     # Parse CLI flags
     shift
     while [[ "$#" -gt 0 ]]; do
@@ -334,6 +340,7 @@ generate_systemd_conf() {
             | --standard-error \
             | --success-exit-status \
             | --custom-service-content \
+            | --working-directory \
             )
                 var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
                 shift
@@ -345,11 +352,21 @@ generate_systemd_conf() {
                 shift
                 limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}"
                 ;;
+            --exec-start-pre)
+                shift
+                [[ -n "$exec_start_pre" ]] && exec_start_pre+=$'\n'
+                exec_start_pre+="ExecStartPre=${1:?"--exec-start-pre value is missing"}"
+                ;;
+            --exec-start-post)
+                shift
+                [[ -n "$exec_start_post" ]] && exec_start_post+=$'\n'
+                exec_start_post+="ExecStartPost=${1:?"--exec-start-post value is missing"}"
+                ;;
             --environment)
                 shift
                 # It is possible to add multiple environment lines
                 [[ -n "$environment" ]] && environment+=$'\n'
-                environment+="Environment=${1:?"environment" is missing}"
+                environment+="Environment=${1:?"--environment value is missing"}"
                 ;;
             *)
                 echo "Invalid command line flag ${1}" >&2
@@ -376,8 +393,21 @@ PartOf=bitnami.service
 
 [Service]
 Type=${type}
-ExecStart=${exec_start}
 EOF
+    if [[ -n "$working_directory" ]]; then
+        cat >> "$service_file" <<< "WorkingDirectory=$working_directory"
+    fi
+    if [[ -n "$exec_start_pre" ]]; then
+        # This variable may contain multiple ExecStartPre= directives
+        cat >> "$service_file" <<< "$exec_start_pre"
+    fi
+    if [[ -n "$exec_start" ]]; then
+        cat >> "$service_file" <<< "ExecStart=${exec_start}"
+    fi
+    if [[ -n "$exec_start_post" ]]; then
+        # This variable may contain multiple ExecStartPost= directives
+        cat >> "$service_file" <<< "$exec_start_post"
+    fi
     # Optional stop and reload commands
     if [[ -n "$exec_stop" ]]; then
         cat >> "$service_file" <<< "ExecStop=${exec_stop}"
@@ -399,8 +429,9 @@ EOF
     if [[ -n "$restart" ]]; then
         cat >> "$service_file" <<< "Restart=${restart}"
     fi
-    # Environment flags (may be specified multiple times in a unit)
+    # Environment flags
     if [[ -n "$environment" ]]; then
+        # This variable may contain multiple Environment= directives
         cat >> "$service_file" <<< "$environment"
     fi
     if [[ -n "$environment_file" ]]; then
@@ -414,6 +445,7 @@ EOF
         cat >> "$service_file" <<< "StandardError=${standard_error}"
     fi
     if [[ -n "$custom_service_content" ]]; then
+        # This variable may contain multiple miscellaneous directives
         cat >> "$service_file" <<< "$custom_service_content"
     fi
     if [[ -n "$success_exit_status" ]]; then
@@ -424,7 +456,8 @@ EOF
     fi
     cat >> "$service_file" <<EOF
 # Optimizations
-TimeoutSec=5min
+TimeoutStartSec=2min
+TimeoutStopSec=30s
 IgnoreSIGPIPE=no
 KillMode=mixed
 EOF
diff --git a/bitnami/percona-mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh b/bitnami/percona-mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh
index ad659fc32820..0057ce2ad1d6 100644
--- a/bitnami/percona-mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh
+++ b/bitnami/percona-mysql/5.7/debian-11/rootfs/opt/bitnami/scripts/libmysql.sh
@@ -516,7 +516,8 @@ mysql_execute_print_output() {
     if [[ -f "$DB_CONF_FILE" ]]; then
         args+=("--defaults-file=${DB_CONF_FILE}")
     fi
-    args+=("-N" "-u" "$user" "$db")
+    args+=("-N" "-u" "$user")
+    [[ -n "$db" ]] && args+=("$db")
     [[ -n "$pass" ]] && args+=("-p$pass")
     [[ "${#opts[@]}" -gt 0 ]] && args+=("${opts[@]}")
     [[ "${#extra_opts[@]}" -gt 0 ]] && args+=("${extra_opts[@]}")
@@ -723,6 +724,11 @@ mysql_stop() {
 mysql_install_db() {
     local command="${DB_BIN_DIR}/mysql_install_db"
     local -a args=("--defaults-file=${DB_CONF_FILE}" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}")
+    
+    # Add flags specified via the 'DB_EXTRA_FLAGS' environment variable
+    read -r -a db_extra_flags <<< "$(mysql_extra_flags)"
+    [[ "${#db_extra_flags[@]}" -gt 0 ]] && args+=("${db_extra_flags[@]}")
+
     am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER")
     if [[ "$DB_FLAVOR" = "mariadb" ]]; then
         args+=("--auth-root-authentication-method=normal")