diff --git a/bitnami/kafka/2/debian-9/Dockerfile b/bitnami/kafka/2/debian-9/Dockerfile
index 9b58be956ead..f74344b7a0ba 100644
--- a/bitnami/kafka/2/debian-9/Dockerfile
+++ b/bitnami/kafka/2/debian-9/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/minideb-extras:stretch-r108
+FROM bitnami/minideb-extras:stretch-r130
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
@@ -12,7 +12,7 @@ RUN bitnami-pkg unpack kafka-2.0.0-1 --checksum a5c583db6dce68f8c71e1f7bd3c92763
 COPY rootfs /
 ENV ALLOW_PLAINTEXT_LISTENER="no" \
     BITNAMI_APP_NAME="kafka" \
-    BITNAMI_IMAGE_VERSION="2.0.0-debian-9-r3" \
+    BITNAMI_IMAGE_VERSION="2.0.0-debian-9-r4" \
     KAFKA_ADVERTISED_LISTENERS="PLAINTEXT://:9092" \
     KAFKA_BROKER_ID="-1" \
     KAFKA_BROKER_PASSWORD="bitnami" \
@@ -49,5 +49,5 @@ ENV ALLOW_PLAINTEXT_LISTENER="no" \
 EXPOSE 9092
 
 USER 1001
-ENTRYPOINT ["/app-entrypoint.sh"]
-CMD ["/run.sh"]
+ENTRYPOINT [ "/app-entrypoint.sh" ]
+CMD [ "/run.sh" ]
diff --git a/bitnami/kafka/README.md b/bitnami/kafka/README.md
index b799ff6024a7..942a8c98857e 100644
--- a/bitnami/kafka/README.md
+++ b/bitnami/kafka/README.md
@@ -49,8 +49,8 @@ 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/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`2-ol-7`, `2.0.0-ol-7-r22` (2/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kafka/blob/2.0.0-ol-7-r22/2/ol-7/Dockerfile)
-* [`2-debian-9`, `2.0.0-debian-9-r3`, `2`, `2.0.0`, `2.0.0-r3`, `latest` (2/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-kafka/blob/2.0.0-debian-9-r3/2/debian-9/Dockerfile)
+* [`2-ol-7`, `2.0.0-ol-7-r21` (2/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kafka/blob/2.0.0-ol-7-r21/2/ol-7/Dockerfile)
+* [`2-debian-9`, `2.0.0-debian-9-r4`, `2`, `2.0.0`, `2.0.0-r4`, `latest` (2/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-kafka/blob/2.0.0-debian-9-r4/2/debian-9/Dockerfile)
 * [`1-ol-7`, `1.1.1-ol-7-r32` (1/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kafka/blob/1.1.1-ol-7-r32/1/ol-7/Dockerfile)
 * [`1-debian-9`, `1.1.1-debian-9-r13`, `1`, `1.1.1`, `1.1.1-r13` (1/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-kafka/blob/1.1.1-debian-9-r13/1/debian-9/Dockerfile)