diff --git a/bitnami/kibana/6/debian-10/Dockerfile b/bitnami/kibana/6/debian-10/Dockerfile
index 2ada90eb83ea..33fafeb0a32d 100644
--- a/bitnami/kibana/6/debian-10/Dockerfile
+++ b/bitnami/kibana/6/debian-10/Dockerfile
@@ -15,12 +15,11 @@ RUN bitnami-pkg unpack kibana-6.8.7-0 --checksum c90b2f8e5c47c34eb9253428adc65f1
 RUN bitnami-pkg install gosu-1.11.0-3 --checksum c18bb8bcc95aa2494793ed5a506c4d03acc82c8c60ad061d5702e0b4048f0cb1
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
-RUN useradd -r -u 1001 -g root kibana
 RUN mkdir -p /bitnami/kibana/ /docker-entrypoint-initdb.d/ && chmod -R g+rwX /bitnami/ /docker-entrypoint-initdb.d/
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="kibana" \
-    BITNAMI_IMAGE_VERSION="6.8.7-debian-10-r20" \
+    BITNAMI_IMAGE_VERSION="6.8.7-debian-10-r21" \
     KIBANA_ELASTICSEARCH_PORT_NUMBER="9200" \
     KIBANA_ELASTICSEARCH_URL="elasticsearch" \
     KIBANA_PORT_NUMBER="5601" \
diff --git a/bitnami/kibana/README.md b/bitnami/kibana/README.md
index d7a0dd65336e..8ef81392688e 100644
--- a/bitnami/kibana/README.md
+++ b/bitnami/kibana/README.md
@@ -50,7 +50,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`7-debian-10`, `7.6.1-debian-10-r19`, `7`, `7.6.1`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/7.6.1-debian-10-r19/7/debian-10/Dockerfile)
-* [`6-debian-10`, `6.8.7-debian-10-r20`, `6`, `6.8.7` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/6.8.7-debian-10-r20/6/debian-10/Dockerfile)
+* [`6-debian-10`, `6.8.7-debian-10-r21`, `6`, `6.8.7` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/6.8.7-debian-10-r21/6/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/kibana GitHub repo](https://github.com/bitnami/bitnami-docker-kibana).