diff --git a/bitnami/drupal/8/Dockerfile b/bitnami/drupal/8/Dockerfile
index 22ccc5666db8..6ecb729f89db 100644
--- a/bitnami/drupal/8/Dockerfile
+++ b/bitnami/drupal/8/Dockerfile
@@ -1,12 +1,12 @@
-FROM bitnami/minideb-extras:jessie-r69
+FROM bitnami/minideb-extras:jessie-r75
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 # Install required system packages and dependencies
 RUN install_packages libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libxml2 libxslt1.1 zlib1g
 RUN bitnami-pkg unpack apache-2.4.33-4 --checksum f26751a96abdc45db43c4b92eb9f792a4b630ad0edd5667aa73ccafa0aeb3810
-RUN bitnami-pkg unpack php-7.1.18-1 --checksum 56f43b9ae65d24e2602ad4c1f1af6392be92a281684c80d62ba81c195d372c97
+RUN bitnami-pkg unpack php-7.1.18-2 --checksum 2f1c9d6cb897ecde061dac0953e0ef608b25ac329bd84ff0128280dca37d8c26
 RUN bitnami-pkg unpack mysql-client-10.1.33-0 --checksum 1b1608f1c1f4e21f05037225e095c49035ad8bfdb8b580abbb904c9f2448a5c6
-RUN bitnami-pkg install libphp-7.1.18-2 --checksum d6b0e8686332b5af34c988412a2a1b18ba2fd6dda8781b9dc7c6ea3b243aba89
+RUN bitnami-pkg install libphp-7.1.18-3 --checksum 599afaf44074957d02606a6c9c6d0fad5b33510108b313d58b243577b79d4c36
 RUN bitnami-pkg unpack drupal-8.5.4-0 --checksum 26dc0c446f73ec77c77368f0eb4fce79ac6fe061004df82e34e6af71c3fa83e0
 
 COPY rootfs /
@@ -14,7 +14,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="8.5.4-r1" \
+    BITNAMI_IMAGE_VERSION="8.5.4-r2" \
     DRUPAL_DATABASE_NAME="bitnami_drupal" \
     DRUPAL_DATABASE_PASSWORD="" \
     DRUPAL_DATABASE_USER="bn_drupal" \
diff --git a/bitnami/drupal/8/docker-compose.yml b/bitnami/drupal/8/docker-compose.yml
index a616c5353264..f9b809e2c283 100644
--- a/bitnami/drupal/8/docker-compose.yml
+++ b/bitnami/drupal/8/docker-compose.yml
@@ -11,8 +11,6 @@ services:
       - 'mariadb_data:/bitnami'
   drupal:
     image: 'bitnami/drupal:8'
-    labels:
-      kompose.service.type: nodeport
     environment:
       - MARIADB_HOST=mariadb
       - MARIADB_PORT_NUMBER=3306
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index ba1aee582d17..4f0ca83dde97 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -25,7 +25,7 @@ $ docker-compose up -d
 
 # Supported tags and respective `Dockerfile` links
 
-* [`8`, `8.5.4-r0`, `latest` (8/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.4-r0/8/Dockerfile)
+* [`8`, `8.5.4-r2`, `latest` (8/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.4-r2/8/Dockerfile)
 * [`8-ol-7`, `8.5.4-ol-7-r0` (8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.4-ol-7-r0/8/ol-7/Dockerfile)
 * [`8-rhel-7`, `8.5.4-rhel-7-r0` (8/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.4-rhel-7-r0/8/rhel-7/Dockerfile)
 * [`8-php5-rhel-7`, `8.5.4-php5-rhel-7-r1` (8-php5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.4-php5-rhel-7-r1/8-php5/rhel-7/Dockerfile)