diff --git a/bitnami/magento/2/debian-9/Dockerfile b/bitnami/magento/2/debian-9/Dockerfile
index 7312587b7cff..6788ab645b55 100644
--- a/bitnami/magento/2/debian-9/Dockerfile
+++ b/bitnami/magento/2/debian-9/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/minideb-extras:stretch-r366
+FROM bitnami/minideb-extras:stretch-r367
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 # Install required system packages and dependencies
@@ -7,7 +7,7 @@ RUN bitnami-pkg unpack apache-2.4.39-1 --checksum 8b191adc55155e604cc224309a0179
 RUN bitnami-pkg unpack php-7.1.29-0 --checksum cd0fba56de5fc1fa5c3d4eb5ef85bcd613cf0875fefe37beaddc9327f5cd7d8e
 RUN bitnami-pkg unpack mysql-client-10.2.24-0 --checksum 99b9d2d0ac257a4c8945d5fa69b5963b0f1fed53866cd7bf64675850481d50d7
 RUN bitnami-pkg unpack libphp-7.1.29-0 --checksum cd6c0c8fdd006dcb730cc4fe3c42420c00f2db9641353be735b8e29f579c34f8
-RUN bitnami-pkg unpack magento-2.3.1-2 --checksum de00b8df7f4102c842d6df4cf84a74e08ca9d8b86c4bdd8d1427c2dc8514e1a8
+RUN bitnami-pkg unpack magento-2.3.1-4 --checksum c5d3beedda736721873d4d7e15bddc26f465305452ba9db520528bf903b284e5
 RUN mkdir -p /opt/bitnami/apache/tmp && chmod g+rwX /opt/bitnami/apache/tmp
 RUN sed -i -e '/pam_loginuid.so/ s/^#*/#/' /etc/pam.d/cron
 RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log
@@ -19,7 +19,9 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="magento" \
-    BITNAMI_IMAGE_VERSION="2.3.1-debian-9-r34" \
+    BITNAMI_IMAGE_VERSION="2.3.1-debian-9-r35" \
+    ELASTICSEARCH_HOST="" \
+    ELASTICSEARCH_PORT_NUMBER="" \
     EXTERNAL_HTTPS_PORT_NUMBER="443" \
     EXTERNAL_HTTP_PORT_NUMBER="80" \
     MAGENTO_ADMINURI="admin" \
diff --git a/bitnami/magento/2/debian-9/docker-compose.yml b/bitnami/magento/2/debian-9/docker-compose.yml
index ad65932e39e3..44bf0226f86b 100644
--- a/bitnami/magento/2/debian-9/docker-compose.yml
+++ b/bitnami/magento/2/debian-9/docker-compose.yml
@@ -17,6 +17,8 @@ services:
       - MAGENTO_DATABASE_USER=bn_magento
       - MAGENTO_DATABASE_PASSWORD=magento_db_password
       - MAGENTO_DATABASE_NAME=bitnami_magento
+      - ELASTICSEARCH_HOST=elasticsearch
+      - ELASTICSEARCH_PORT_NUMBER=9200
     ports:
       - '80:80'
       - '443:443'
@@ -24,7 +26,14 @@ services:
       - 'magento_data:/bitnami'
     depends_on:
       - mariadb
+      - elasticsearch
+  elasticsearch:
+    image: 'bitnami/elasticsearch:6'
+    volumes:
+      - 'elasticsearch_data:/bitnami/elasticsearch/data'
 volumes:
+  elasticsearch_data:
+    driver: local
   mariadb_data:
     driver: local
   magento_data:
diff --git a/bitnami/magento/2/debian-9/rootfs/magento-inputs.json b/bitnami/magento/2/debian-9/rootfs/magento-inputs.json
index e55c22da3fd4..71f13b2a761f 100644
--- a/bitnami/magento/2/debian-9/rootfs/magento-inputs.json
+++ b/bitnami/magento/2/debian-9/rootfs/magento-inputs.json
@@ -5,6 +5,8 @@
   "databaseServerHost": "{{$global.env.MARIADB_HOST}}",
   "databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}",
   "databaseUser": "{{$global.env.MAGENTO_DATABASE_USER}}",
+  "elasticsearchServerHost": "{{$global.env.ELASTICSEARCH_HOST}}",
+  "elasticsearchServerPort": "{{$global.env.ELASTICSEARCH_PORT_NUMBER}}",
   "email": "{{$global.env.MAGENTO_EMAIL}}",
   "externalHttpPort": "{{$global.env.EXTERNAL_HTTP_PORT_NUMBER}}",
   "externalHttpsPort": "{{$global.env.EXTERNAL_HTTPS_PORT_NUMBER}}",
diff --git a/bitnami/magento/README.md b/bitnami/magento/README.md
index d387be037343..d5d80da06616 100644
--- a/bitnami/magento/README.md
+++ b/bitnami/magento/README.md
@@ -38,7 +38,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`2-ol-7`, `2.3.1-ol-7-r44` (2/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-magento/blob/2.3.1-ol-7-r44/2/ol-7/Dockerfile)
-* [`2-debian-9`, `2.3.1-debian-9-r34`, `2`, `2.3.1`, `2.3.1-r34`, `latest` (2/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-magento/blob/2.3.1-debian-9-r34/2/debian-9/Dockerfile)
+* [`2-debian-9`, `2.3.1-debian-9-r35`, `2`, `2.3.1`, `2.3.1-r35`, `latest` (2/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-magento/blob/2.3.1-debian-9-r35/2/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/magento GitHub repo](https://github.com/bitnami/bitnami-docker-magento).
 
diff --git a/bitnami/magento/docker-compose.yml b/bitnami/magento/docker-compose.yml
index ad65932e39e3..44bf0226f86b 100644
--- a/bitnami/magento/docker-compose.yml
+++ b/bitnami/magento/docker-compose.yml
@@ -17,6 +17,8 @@ services:
       - MAGENTO_DATABASE_USER=bn_magento
       - MAGENTO_DATABASE_PASSWORD=magento_db_password
       - MAGENTO_DATABASE_NAME=bitnami_magento
+      - ELASTICSEARCH_HOST=elasticsearch
+      - ELASTICSEARCH_PORT_NUMBER=9200
     ports:
       - '80:80'
       - '443:443'
@@ -24,7 +26,14 @@ services:
       - 'magento_data:/bitnami'
     depends_on:
       - mariadb
+      - elasticsearch
+  elasticsearch:
+    image: 'bitnami/elasticsearch:6'
+    volumes:
+      - 'elasticsearch_data:/bitnami/elasticsearch/data'
 volumes:
+  elasticsearch_data:
+    driver: local
   mariadb_data:
     driver: local
   magento_data: