diff --git a/bitnami/keycloak/18/debian-11/Dockerfile b/bitnami/keycloak/18/debian-11/Dockerfile
index cd77b5782d62..1d9b0773b7ba 100644
--- a/bitnami/keycloak/18/debian-11/Dockerfile
+++ b/bitnami/keycloak/18/debian-11/Dockerfile
@@ -1,6 +1,4 @@
 FROM docker.io/bitnami/minideb:bullseye
-LABEL maintainer "Bitnami <containers@bitnami.com>"
-
 ENV HOME="/" \
     OS_ARCH="amd64" \
     OS_FLAVOUR="debian-11" \
@@ -9,6 +7,7 @@ ENV HOME="/" \
 ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 
 COPY prebuildfs /
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libaio1 libc6 procps rsync tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" "1.0.3-150" --checksum 1013e2ebbe58e5dc8f3c79fc952f020fc5306ba48463803cacfbed7779173924
diff --git a/bitnami/keycloak/18/debian-11/rootfs/opt/bitnami/scripts/keycloak-env.sh b/bitnami/keycloak/18/debian-11/rootfs/opt/bitnami/scripts/keycloak-env.sh
index 7e800f04b09a..e27f8e01e6a3 100644
--- a/bitnami/keycloak/18/debian-11/rootfs/opt/bitnami/scripts/keycloak-env.sh
+++ b/bitnami/keycloak/18/debian-11/rootfs/opt/bitnami/scripts/keycloak-env.sh
@@ -101,8 +101,8 @@ export KEYCLOAK_DEFAULT_CONF_FILE="keycloak.conf"
 KEYCLOAK_ADMIN="${KEYCLOAK_ADMIN:-"${KEYCLOAK_ADMIN_USER:-}"}"
 export KEYCLOAK_ADMIN="${KEYCLOAK_ADMIN:-user}"
 KEYCLOAK_ADMIN_PASSWORD="${KEYCLOAK_ADMIN_PASSWORD:-"${KEYCLOAK_ADMIN_PASSWORD:-}"}"
-export KEYCLOAK_HTTP_RELATIVE_PATH="${KEYCLOAK_HTTP_RELATIVE_PATH:-/}"
 export KEYCLOAK_ADMIN_PASSWORD="${KEYCLOAK_ADMIN_PASSWORD:-bitnami}"
+export KEYCLOAK_HTTP_RELATIVE_PATH="${KEYCLOAK_HTTP_RELATIVE_PATH:-/}"
 export KEYCLOAK_HTTP_PORT="${KEYCLOAK_HTTP_PORT:-8080}"
 export KEYCLOAK_HTTPS_PORT="${KEYCLOAK_HTTPS_PORT:-8443}"
 export KEYCLOAK_BIND_ADDRESS="${KEYCLOAK_BIND_ADDRESS:-$(hostname --fqdn)}"
diff --git a/bitnami/keycloak/README.md b/bitnami/keycloak/README.md
index be2c7a5136ac..a105c85c0884 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.1`, `18.0.1-debian-11-r1`, `latest` (18/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-keycloak/blob/18.0.1-debian-11-r1/18/debian-11/Dockerfile)
+* [`18`, `18-debian-11`, `18.0.1`, `18.0.1-debian-11-r2`, `latest` (18/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-keycloak/blob/18.0.1-debian-11-r2/18/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/keycloak GitHub repo](https://github.com/bitnami/bitnami-docker-keycloak).
 
@@ -154,18 +154,18 @@ Apart from that, the following environment variables must be set:
 In order to add new themes to Keycloak, you can mount them to the `/opt/bitnami/keycloak/themes` folder. The example below mounts a new theme.
 
 ```yaml
-version: "2"
+version: '2'
 services:
   postgresql:
-    image: "docker.io/bitnami/postgresql:11-debian-10"
+    image: docker.io/bitnami/postgresql:latest
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
       - POSTGRESQL_USERNAME=bn_keycloak
       - POSTGRESQL_DATABASE=bitnami_keycloak
     volumes:
-      - "postgresql_data:/bitnami/postgresql"
+      - 'postgresql_data:/bitnami/postgresql'
   keycloak:
-    image: docker.io/bitnami/keycloak:12-debian-10
+    image: docker.io/bitnami/keycloak:latest
     ports:
       - "80:8080"
     environment:
@@ -173,7 +173,7 @@ services:
     depends_on:
       - postgresql
     volumes:
-      - "./mynewtheme:/opt/bitnami/keycloak/themes/mynewtheme"
+      - './mynewtheme:/opt/bitnami/keycloak/themes/mynewtheme'
 volumes:
   postgresql_data:
     driver: local