diff --git a/bitnami/drupal/8/debian-10/Dockerfile b/bitnami/drupal/8/debian-10/Dockerfile
index 940e2e18ab3a..544e63391f5d 100644
--- a/bitnami/drupal/8/debian-10/Dockerfile
+++ b/bitnami/drupal/8/debian-10/Dockerfile
@@ -26,7 +26,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="drupal" \
-    BITNAMI_IMAGE_VERSION="8.8.5-debian-10-r39" \
+    BITNAMI_IMAGE_VERSION="8.8.5-debian-10-r40" \
     DRUPAL_DATABASE_NAME="bitnami_drupal" \
     DRUPAL_DATABASE_PASSWORD="" \
     DRUPAL_DATABASE_USER="bn_drupal" \
diff --git a/bitnami/drupal/8/debian-10/prebuildfs/build/install-nami.sh b/bitnami/drupal/8/debian-10/prebuildfs/build/install-nami.sh
index d8a59c381f6d..455022638541 100755
--- a/bitnami/drupal/8/debian-10/prebuildfs/build/install-nami.sh
+++ b/bitnami/drupal/8/debian-10/prebuildfs/build/install-nami.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-1.0.0-1-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz
-echo "80488279b056d5e9c183fe34097c5f496715ab16a602afcc9f78d59f15139a16 /tmp/nami-linux-x64.tar.gz" | sha256sum --check
+curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-2.0.0-0-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz
+echo "63e836f3d752cb157b175e1efe2238e5b4e04ab139097c682ca5a0651f0df65c /tmp/nami-linux-x64.tar.gz" | sha256sum --check
 mkdir -p /opt/bitnami/nami /opt/bitnami/licenses
 tar xzf /tmp/nami-linux-x64.tar.gz --strip 1 -C /opt/bitnami/nami && rm /tmp/nami-linux-x64.tar.gz
-curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-1.0.0-1.txt
+curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-2.0.0-0.txt
diff --git a/bitnami/drupal/README.md b/bitnami/drupal/README.md
index a2aedcc2358f..14700f2463f6 100644
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -36,7 +36,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`8-debian-10`, `8.8.5-debian-10-r39`, `8`, `8.8.5`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.8.5-debian-10-r39/8/debian-10/Dockerfile)
+* [`8-debian-10`, `8.8.5-debian-10-r40`, `8`, `8.8.5`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.8.5-debian-10-r40/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).