diff --git a/bitnami/kibana/7/debian-9/Dockerfile b/bitnami/kibana/7/debian-9/Dockerfile
new file mode 100644
index 000000000000..88476b2e240e
--- /dev/null
+++ b/bitnami/kibana/7/debian-9/Dockerfile
@@ -0,0 +1,25 @@
+FROM bitnami/minideb-extras:stretch-r373
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
+    BITNAMI_PKG_EXTRA_DIRS="/opt/bitnami/kibana/optimize" \
+    HOME="/"
+
+# Install required system packages and dependencies
+RUN install_packages libc6 libgcc1 libstdc++6
+RUN bitnami-pkg unpack kibana-7.1.1-0 --checksum 733476de720e5e5cfd6eaee366993b5cb725ce1e8fe227bc7ed9f8d15ac3eec2
+
+COPY rootfs /
+ENV BITNAMI_APP_NAME="kibana" \
+    BITNAMI_IMAGE_VERSION="7.1.1-debian-9-r0" \
+    KIBANA_ELASTICSEARCH_PORT_NUMBER="9200" \
+    KIBANA_ELASTICSEARCH_URL="elasticsearch" \
+    KIBANA_PORT_NUMBER="5601" \
+    NAMI_PREFIX="/.nami" \
+    PATH="/opt/bitnami/kibana/bin:$PATH"
+
+EXPOSE 5601
+
+USER 1001
+ENTRYPOINT [ "/app-entrypoint.sh" ]
+CMD [ "/run.sh" ]
diff --git a/bitnami/kibana/7/debian-9/docker-compose.yml b/bitnami/kibana/7/debian-9/docker-compose.yml
new file mode 100644
index 000000000000..9fb7a5a27888
--- /dev/null
+++ b/bitnami/kibana/7/debian-9/docker-compose.yml
@@ -0,0 +1,19 @@
+version: '2'
+services:
+  elasticsearch:
+    image: 'bitnami/elasticsearch:7'
+    volumes:
+      - 'elasticsearch_data:/bitnami'
+  kibana:
+    image: 'bitnami/kibana:7'
+    ports:
+      - '5601:5601'
+    volumes:
+      - 'kibana_data:/bitnami'
+    depends_on:
+      - elasticsearch
+volumes:
+  elasticsearch_data:
+    driver: local
+  kibana_data:
+    driver: local
diff --git a/bitnami/kibana/7/debian-9/rootfs/app-entrypoint.sh b/bitnami/kibana/7/debian-9/rootfs/app-entrypoint.sh
new file mode 100755
index 000000000000..73f8e1d6eef7
--- /dev/null
+++ b/bitnami/kibana/7/debian-9/rootfs/app-entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+print_welcome_page
+
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then
+  nami_initialize kibana
+  info "Starting kibana... "
+fi
+
+exec tini -- "$@"
diff --git a/bitnami/kibana/7/debian-9/rootfs/kibana-inputs.json b/bitnami/kibana/7/debian-9/rootfs/kibana-inputs.json
new file mode 100644
index 000000000000..442acad1df1b
--- /dev/null
+++ b/bitnami/kibana/7/debian-9/rootfs/kibana-inputs.json
@@ -0,0 +1,5 @@
+{
+  "elasticsearchPort": "{{$global.env.KIBANA_ELASTICSEARCH_PORT_NUMBER}}",
+  "elasticsearchURL": "{{$global.env.KIBANA_ELASTICSEARCH_URL}}",
+  "port": "{{$global.env.KIBANA_PORT_NUMBER}}"
+}
\ No newline at end of file
diff --git a/bitnami/kibana/7/debian-9/rootfs/run.sh b/bitnami/kibana/7/debian-9/rootfs/run.sh
new file mode 100755
index 000000000000..fab636afe846
--- /dev/null
+++ b/bitnami/kibana/7/debian-9/rootfs/run.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+DAEMON=kibana
+EXEC=$(which $DAEMON)
+START_COMMAND="${EXEC} serve"
+
+cd /opt/bitnami/kibana || exit 1
+
+# If container is started as `root` user
+if [[ $EUID -eq 0 ]]; then
+    exec gosu "${DAEMON}" bash -c "${START_COMMAND}"
+else
+    exec bash -c "${START_COMMAND}"
+fi
diff --git a/bitnami/kibana/README.md b/bitnami/kibana/README.md
index 6ddc8f070fd9..1f6a837170d3 100644
--- a/bitnami/kibana/README.md
+++ b/bitnami/kibana/README.md
@@ -49,12 +49,12 @@ 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/).
 
 
+* [`7-debian-9`, `7.1.1-debian-9-r0`, `7`, `7.1.1`, `7.1.1-r0`, `latest` (7/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/7.1.1-debian-9-r0/7/debian-9/Dockerfile)
 * [`6-ol-7`, `6.8.0-ol-7-r8` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/6.8.0-ol-7-r8/6/ol-7/Dockerfile)
-* [`6-debian-9`, `6.8.0-debian-9-r9`, `6`, `6.8.0`, `6.8.0-r9`, `latest` (6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/6.8.0-debian-9-r9/6/debian-9/Dockerfile)
+* [`6-debian-9`, `6.8.0-debian-9-r9`, `6`, `6.8.0`, `6.8.0-r9` (6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/6.8.0-debian-9-r9/6/debian-9/Dockerfile)
 * [`6-rhel-7`, `6.7.2-rhel-7-r0` (6/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/6.7.2-rhel-7-r0/6/rhel-7/Dockerfile)
-* [`5-ol-7`, `5.6.16-ol-7-r59` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/5.6.16-ol-7-r59/5/ol-7/Dockerfile)
-* [`5-debian-9`, `5.6.16-debian-9-r50`, `5`, `5.6.16`, `5.6.16-r50` (5/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/5.6.16-debian-9-r50/5/debian-9/Dockerfile)
-* [`5-rhel-7`, `5.6.14-rhel-7-r39` (5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/5.6.14-rhel-7-r39/5/rhel-7/Dockerfile)
+* [`7-rhel-7`, `0.0.0-rhel-7-r0` (7/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/0.0.0-rhel-7-r0/7/rhel-7/Dockerfile)
+* [`7-ol-7`, `0.0.0-ol-7-r0` (7/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kibana/blob/0.0.0-ol-7-r0/7/ol-7/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/kibana GitHub repo](https://github.com/bitnami/bitnami-docker-kibana).
 
diff --git a/bitnami/kibana/docker-compose.yml b/bitnami/kibana/docker-compose.yml
index 7d062479e59c..9fb7a5a27888 100644
--- a/bitnami/kibana/docker-compose.yml
+++ b/bitnami/kibana/docker-compose.yml
@@ -1,11 +1,11 @@
 version: '2'
 services:
   elasticsearch:
-    image: 'bitnami/elasticsearch:6'
+    image: 'bitnami/elasticsearch:7'
     volumes:
       - 'elasticsearch_data:/bitnami'
   kibana:
-    image: 'bitnami/kibana:6'
+    image: 'bitnami/kibana:7'
     ports:
       - '5601:5601'
     volumes: