diff --git a/bitnami/postgresql-repmgr/12/debian-10/Dockerfile b/bitnami/postgresql-repmgr/12/debian-10/Dockerfile
index 350ae3713ea2..12fd36aa2689 100644
--- a/bitnami/postgresql-repmgr/12/debian-10/Dockerfile
+++ b/bitnami/postgresql-repmgr/12/debian-10/Dockerfile
@@ -22,7 +22,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="postgresql-repmgr" \
-    BITNAMI_IMAGE_VERSION="12.8.0-debian-10-r74" \
+    BITNAMI_IMAGE_VERSION="12.8.0-debian-10-r75" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql-repmgr/12/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql-repmgr/12/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 2a4f52aa35e6..4500abcc7ce1 100644
--- a/bitnami/postgresql-repmgr/12/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql-repmgr/12/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -1255,6 +1255,7 @@ EOF
     fi
 }
 
+
 ########################
 # Retrieves the WAL directory in use by PostgreSQL / to use if not initialized yet
 # Globals:
@@ -1265,8 +1266,8 @@ EOF
 #   the path to the WAL directory, or empty if not set
 #########################
 postgresql_get_waldir() {
-    if [[ -L "$POSTGRESQL_DATA_DIR/pg_wal" && -d "$POSTGRESQL_DATA_DIR/pg_wal" ]]; then
-        readlink -f "$POSTGRESQL_DATA_DIR/pg_wal"
+    if [[ -L "${POSTGRESQL_DATA_DIR}/pg_wal" && -d "${POSTGRESQL_DATA_DIR}/pg_wal" ]]; then
+        readlink -f "${POSTGRESQL_DATA_DIR}/pg_wal"
     else
         # Uninitialized - using value from $POSTGRESQL_INITDB_WAL_DIR if set
         echo "$POSTGRESQL_INITDB_WAL_DIR"
diff --git a/bitnami/postgresql-repmgr/12/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh b/bitnami/postgresql-repmgr/12/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh
index da37fa261737..ad1d6a6c8607 100644
--- a/bitnami/postgresql-repmgr/12/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh
+++ b/bitnami/postgresql-repmgr/12/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh
@@ -447,7 +447,7 @@ repmgr_postgresql_configuration() {
 repmgr_generate_repmgr_config() {
     info "Preparing repmgr configuration..."
 
-    # If using a distinct WAL directory ($POSTGRESQL_DATA_DIR/pg_wal is a symlink to an existing dir or $POSTGRESQL_INITDB_WAL_DIR when not initialized),
+    # If using a distinct WAL directory (${POSTGRESQL_DATA_DIR}/pg_wal is a symlink to an existing dir or $POSTGRESQL_INITDB_WAL_DIR is set a custom value during 1st boot),
     # set the "--waldir" option accordingly
     local -r waldir=$(postgresql_get_waldir)
     local -r waldir_option=$([[ -n "$waldir" ]] && echo "--waldir=$waldir")
diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md
index f0cbb5bf039a..410f4400b67f 100644
--- a/bitnami/postgresql-repmgr/README.md
+++ b/bitnami/postgresql-repmgr/README.md
@@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`14`, `14-debian-10`, `14.0.0`, `14.0.0-debian-10-r3` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/14.0.0-debian-10-r3/14/debian-10/Dockerfile)
 * [`13`, `13-debian-10`, `13.4.0`, `13.4.0-debian-10-r71` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.4.0-debian-10-r71/13/debian-10/Dockerfile)
-* [`12`, `12-debian-10`, `12.8.0`, `12.8.0-debian-10-r74` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.8.0-debian-10-r74/12/debian-10/Dockerfile)
+* [`12`, `12-debian-10`, `12.8.0`, `12.8.0-debian-10-r75` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.8.0-debian-10-r75/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.13.0`, `11.13.0-debian-10-r58`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.13.0-debian-10-r58/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.18.0`, `10.18.0-debian-10-r72` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.18.0-debian-10-r72/10/debian-10/Dockerfile)
 * [`9.6`, `9.6-debian-10`, `9.6.23`, `9.6.23-debian-10-r73` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/9.6.23-debian-10-r73/9.6/debian-10/Dockerfile)