diff --git a/bitnami/pgpool/4/debian-12/Dockerfile b/bitnami/pgpool/4/debian-12/Dockerfile
index 9221a62d79d2..a3e627b043d2 100644
--- a/bitnami/pgpool/4/debian-12/Dockerfile
+++ b/bitnami/pgpool/4/debian-12/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-02-21T12:52:18Z" \
+      org.opencontainers.image.created="2024-02-23T13:12:24Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.5.0-debian-12-r9" \
+      org.opencontainers.image.ref.name="4.5.0-debian-12-r10" \
       org.opencontainers.image.title="pgpool" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.5.0"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl ldap-utils libaudit1 libbsd0 libcap-ng0 libcom-err2 libcrypt1 libedit2 libffi8 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu72 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.5-0 libldap-common liblzma5 libmd0 libnettle8 libnss-ldapd libp11-kit0 libpam-ldapd libpam0g libpq5 libsasl2-2 libssl3 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 nslcd procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "wait-for-port-1.0.7-8-linux-${OS_ARCH}-debian-12" \
+      "wait-for-port-1.0.7-9-linux-${OS_ARCH}-debian-12" \
       "postgresql-client-14.11.0-2-linux-${OS_ARCH}-debian-12" \
       "pgpool-4.5.0-2-linux-${OS_ARCH}-debian-12" \
     ) ; \
diff --git a/bitnami/pgpool/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pgpool/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 71a5161678c0..59e031e724e6 100644
--- a/bitnami/pgpool/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/pgpool/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,6 +15,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.7-8"
+        "version": "1.0.7-9"
     }
 }
\ No newline at end of file
diff --git a/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/libpgpool.sh b/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/libpgpool.sh
index 21c6b272167d..d843d3534ded 100644
--- a/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/libpgpool.sh
+++ b/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/libpgpool.sh
@@ -34,6 +34,8 @@ export PGPOOL_BASE_DIR="/opt/bitnami/pgpool"
 export PGPOOL_DATA_DIR="${PGPOOL_BASE_DIR}/data"
 export PGPOOL_CONF_DIR="${PGPOOL_BASE_DIR}/conf"
 export PGPOOL_ETC_DIR="${PGPOOL_BASE_DIR}/etc"
+export PGPOOL_DEFAULT_CONF_DIR="${PGPOOL_BASE_DIR}/conf.default"
+export PGPOOL_DEFAULT_ETC_DIR="${PGPOOL_BASE_DIR}/etc.default"
 export PGPOOL_LOG_DIR="${PGPOOL_BASE_DIR}/logs"
 export PGPOOL_TMP_DIR="${PGPOOL_BASE_DIR}/tmp"
 export PGPOOL_BIN_DIR="${PGPOOL_BASE_DIR}/bin"
diff --git a/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/pgpool/entrypoint.sh b/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/pgpool/entrypoint.sh
index 5f34b7636db1..7a7986231ab7 100755
--- a/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/pgpool/entrypoint.sh
+++ b/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/pgpool/entrypoint.sh
@@ -14,6 +14,7 @@ set -o pipefail
 # Load libraries
 . /opt/bitnami/scripts/libbitnami.sh
 . /opt/bitnami/scripts/liblog.sh
+. /opt/bitnami/scripts/libfs.sh
 . /opt/bitnami/scripts/libpgpool.sh
 
 # Load Pgpool env. variables
@@ -21,6 +22,22 @@ eval "$(pgpool_env)"
 
 print_welcome_page
 
+if ! is_dir_empty "$PGPOOL_DEFAULT_CONF_DIR"; then
+    # We add the copy from default config in the entrypoint to not break users
+    # bypassing the setup.sh logic. If the file already exists do not overwrite (in
+    # case someone mounts a configuration file in /opt/bitnami/pgpool/conf)
+    debug "Copying files from $PGPOOL_DEFAULT_CONF_DIR to $PGPOOL_CONF_DIR"
+    cp -nr "$PGPOOL_DEFAULT_CONF_DIR"/. "$PGPOOL_CONF_DIR"
+fi
+
+if ! is_dir_empty "$PGPOOL_DEFAULT_ETC_DIR"; then
+    # We add the copy from default config in the entrypoint to not break users
+    # bypassing the setup.sh logic. If the file already exists do not overwrite (in
+    # case someone mounts a configuration file in /opt/bitnami/pgpool/etc)
+    debug "Copying files from $PGPOOL_DEFAULT_ETC_DIR to $PGPOOL_ETC_DIR"
+    cp -nr "$PGPOOL_DEFAULT_ETC_DIR"/. "$PGPOOL_ETC_DIR"
+fi
+
 if [[ "$*" = *"/opt/bitnami/scripts/pgpool/run.sh"* ]]; then
     info "** Starting Pgpool-II setup **"
     /opt/bitnami/scripts/pgpool/setup.sh
diff --git a/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/pgpool/postunpack.sh b/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/pgpool/postunpack.sh
index f72f518977a9..bf2017fbf730 100755
--- a/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/pgpool/postunpack.sh
+++ b/bitnami/pgpool/4/debian-12/rootfs/opt/bitnami/scripts/pgpool/postunpack.sh
@@ -16,7 +16,7 @@ eval "$(pgpool_env)"
 # Load LDAP environment variables
 eval "$(ldap_env)"
 
-for dir in "$PGPOOL_INITSCRIPTS_DIR" "$PGPOOL_TMP_DIR" "$PGPOOL_LOG_DIR" "$PGPOOL_CONF_DIR" "$PGPOOL_ETC_DIR" "$PGPOOL_DATA_DIR"; do
+for dir in "$PGPOOL_INITSCRIPTS_DIR" "$PGPOOL_TMP_DIR" "$PGPOOL_LOG_DIR" "$PGPOOL_CONF_DIR" "$PGPOOL_DEFAULT_CONF_DIR" "$PGPOOL_ETC_DIR" "$PGPOOL_DEFAULT_ETC_DIR" "$PGPOOL_DATA_DIR"; do
     ensure_dir_exists "$dir"
     chmod -R g+rwX "$dir"
 done
@@ -27,3 +27,11 @@ ldap_create_pam_config "pgpool"
 
 # Redirect all logging to stdout
 ln -sf /dev/stdout "$PGPOOL_LOG_FILE"
+
+if ! is_dir_empty "$PGPOOL_CONF_DIR"; then
+    cp -r "$PGPOOL_CONF_DIR"/* "$PGPOOL_DEFAULT_CONF_DIR"
+fi
+
+if ! is_dir_empty "$PGPOOL_ETC_DIR"; then
+    cp -r "$PGPOOL_ETC_DIR"/* "$PGPOOL_DEFAULT_ETC_DIR"
+fi
\ No newline at end of file