diff --git a/bitnami/keycloak/18/debian-11/rootfs/opt/bitnami/scripts/libkeycloak.sh b/bitnami/keycloak/18/debian-11/rootfs/opt/bitnami/scripts/libkeycloak.sh
index 5bfbace9178d..b84cf3a31ec6 100644
--- a/bitnami/keycloak/18/debian-11/rootfs/opt/bitnami/scripts/libkeycloak.sh
+++ b/bitnami/keycloak/18/debian-11/rootfs/opt/bitnami/scripts/libkeycloak.sh
@@ -119,11 +119,14 @@ keycloak_conf_set() {
 #   None
 #########################
 keycloak_configure_database() {
+    local jdbc_params
+    jdbc_params="$(echo "$KEYCLOAK_JDBC_PARAMS" | sed -E '/^$|^\&.+$/!s/^/\&/;s/\&/\\&/g')"
+
     info "Configuring database settings"
     keycloak_conf_set "db" "postgres"
     keycloak_conf_set "db-username" "$KEYCLOAK_DATABASE_USER"
     keycloak_conf_set "db-password" "$KEYCLOAK_DATABASE_PASSWORD"
-    keycloak_conf_set "db-url" "jdbc:postgresql://${KEYCLOAK_DATABASE_HOST}:${KEYCLOAK_DATABASE_PORT}/${KEYCLOAK_DATABASE_NAME}?currentSchema=${KEYCLOAK_DATABASE_SCHEMA}"
+    keycloak_conf_set "db-url" "jdbc:postgresql://${KEYCLOAK_DATABASE_HOST}:${KEYCLOAK_DATABASE_PORT}/${KEYCLOAK_DATABASE_NAME}?currentSchema=${KEYCLOAK_DATABASE_SCHEMA}${jdbc_params}"
 }
 
 ########################
diff --git a/bitnami/keycloak/README.md b/bitnami/keycloak/README.md
index 6d9fff03f7ea..64cb54aa9e0c 100644
--- a/bitnami/keycloak/README.md
+++ b/bitnami/keycloak/README.md
@@ -44,7 +44,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/).
 
 
-* [`18`, `18-debian-11`, `18.0.2`, `18.0.2-debian-11-r6`, `latest` (18/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-keycloak/blob/18.0.2-debian-11-r6/18/debian-11/Dockerfile)
+* [`18`, `18-debian-11`, `18.0.2`, `18.0.2-debian-11-r7`, `latest` (18/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-keycloak/blob/18.0.2-debian-11-r7/18/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/keycloak GitHub repo](https://github.com/bitnami/bitnami-docker-keycloak).