diff --git a/bitnami/postgresql/11/debian-10/Dockerfile b/bitnami/postgresql/11/debian-10/Dockerfile
index dc96df3dcbd6..8a997ff7bfd1 100644
--- a/bitnami/postgresql/11/debian-10/Dockerfile
+++ b/bitnami/postgresql/11/debian-10/Dockerfile
@@ -24,7 +24,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/postgresql/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="11.10.0-debian-10-r0" \
+    BITNAMI_IMAGE_VERSION="11.10.0-debian-10-r1" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 8e6faa3ca5b9..d2b44756b758 100644
--- a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -392,12 +392,26 @@ postgresql_configure_replication_parameters() {
         postgresql_set_property "wal_keep_segments" "12"
     fi
     postgresql_set_property "hot_standby" "on"
+}
+
+
+########################
+# Change postgresql.conf by setting parameters for synchronous replication
+# Globals:
+#   POSTGRESQL_*
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+postgresql_configure_synchronous_replication() {
     if ((POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS > 0)); then
         postgresql_set_property "synchronous_commit" "$POSTGRESQL_SYNCHRONOUS_COMMIT_MODE"
         postgresql_set_property "synchronous_standby_names" "${POSTGRESQL_NUM_SYNCHRONOUS_REPLICAS} (\"${POSTGRESQL_CLUSTER_APP_NAME}\")"
     fi
 }
 
+
 ########################
 # Change postgresql.conf by setting TLS properies
 # Globals:
@@ -592,6 +606,7 @@ postgresql_initialize() {
         is_boolean_yes "$create_conf_file" && postgresql_configure_fsync
         is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls
         [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]] && [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && is_boolean_yes "$create_pghba_file" && postgresql_add_replication_to_pghba
+        [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]] && is_boolean_yes "$create_pghba_file" && postgresql_configure_synchronous_replication
         [[ "$POSTGRESQL_REPLICATION_MODE" = "slave" ]] && postgresql_configure_recovery
     else
         if [[ "$POSTGRESQL_REPLICATION_MODE" = "master" ]]; then
@@ -609,6 +624,7 @@ postgresql_initialize() {
             is_boolean_yes "$create_pghba_file" && postgresql_restrict_pghba
             [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && postgresql_create_replication_user
             is_boolean_yes "$create_conf_file" && postgresql_configure_replication_parameters
+            is_boolean_yes "$create_pghba_file" && postgresql_configure_synchronous_replication
             is_boolean_yes "$create_conf_file" && postgresql_configure_fsync
             is_boolean_yes "$create_conf_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && postgresql_configure_tls
             [[ -n "$POSTGRESQL_REPLICATION_USER" ]] && is_boolean_yes "$create_pghba_file" && postgresql_add_replication_to_pghba
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index cf4d434643cb..28b256bd6284 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -46,7 +46,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`13`, `13-debian-10`, `13.1.0`, `13.1.0-debian-10-r0` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.1.0-debian-10-r0/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.5.0`, `12.5.0-debian-10-r0` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.5.0-debian-10-r0/12/debian-10/Dockerfile)
-* [`11`, `11-debian-10`, `11.10.0`, `11.10.0-debian-10-r0`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.10.0-debian-10-r0/11/debian-10/Dockerfile)
+* [`11`, `11-debian-10`, `11.10.0`, `11.10.0-debian-10-r1`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.10.0-debian-10-r1/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.15.0`, `10.15.0-debian-10-r0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.15.0-debian-10-r0/10/debian-10/Dockerfile)
 * [`9.6`, `9.6-debian-10`, `9.6.20`, `9.6.20-debian-10-r0` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.20-debian-10-r0/9.6/debian-10/Dockerfile)