diff --git a/bitnami/discourse/2/debian-10/Dockerfile b/bitnami/discourse/2/debian-10/Dockerfile
index 8a707f0beded..95addc087111 100644
--- a/bitnami/discourse/2/debian-10/Dockerfile
+++ b/bitnami/discourse/2/debian-10/Dockerfile
@@ -25,7 +25,7 @@ RUN /opt/bitnami/ruby/bin/gem install --force bundler -v '< 2'
 COPY rootfs /
 RUN /opt/bitnami/scripts/discourse/postunpack.sh
 ENV BITNAMI_APP_NAME="discourse" \
-    BITNAMI_IMAGE_VERSION="2.7.7-debian-10-r20" \
+    BITNAMI_IMAGE_VERSION="2.7.7-debian-10-r21" \
     PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/ruby/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/git/bin:/opt/bitnami/brotli/bin:$PATH" \
     POSTGRESQL_CLIENT_CREATE_DATABASE_NAME="" \
     POSTGRESQL_CLIENT_CREATE_DATABASE_PASSWORD="" \
diff --git a/bitnami/discourse/2/debian-10/docker-compose.yml b/bitnami/discourse/2/debian-10/docker-compose.yml
index 4fb47f1f7d9b..b1c7febe8eaf 100644
--- a/bitnami/discourse/2/debian-10/docker-compose.yml
+++ b/bitnami/discourse/2/debian-10/docker-compose.yml
@@ -5,12 +5,14 @@ services:
     volumes:
       - 'postgresql_data:/bitnami/postgresql'
     environment:
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
       - POSTGRESQL_USERNAME=bn_discourse
       - POSTGRESQL_DATABASE=bitnami_discourse
   redis:
     image: docker.io/bitnami/redis:6.0
     environment:
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'redis_data:/bitnami/discourse'
@@ -24,6 +26,7 @@ services:
       - postgresql
       - redis
     environment:
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
       - DISCOURSE_HOST=www.example.com
       - DISCOURSE_DATABASE_HOST=postgresql
@@ -43,6 +46,7 @@ services:
       - 'sidekiq_data:/bitnami/discourse'
     command: /opt/bitnami/scripts/discourse-sidekiq/run.sh
     environment:
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
       - DISCOURSE_HOST=www.example.com
       - DISCOURSE_DATABASE_HOST=postgresql
diff --git a/bitnami/discourse/README.md b/bitnami/discourse/README.md
index d0ed9069df7a..29935618ce95 100644
--- a/bitnami/discourse/README.md
+++ b/bitnami/discourse/README.md
@@ -13,7 +13,7 @@ $ curl -sSL https://raw.githubusercontent.com/bitnami/bitnami-docker-discourse/m
 $ docker-compose up -d
 ```
 
-You can find the default credentials and available configuration options in the [Environment Variables](#environment-variables) section.
+**Warning**: This quick setup is only intended for development environments. You are encouraged to change the insecure default credentials and check out the available configuration options in the [Environment Variables](#environment-variables) section for a more secure deployment.
 
 ## Why use Bitnami Images?
 
@@ -31,7 +31,7 @@ You can find the default credentials and available configuration options in the
 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/).
 
 
-- [`2`, `2-debian-10`, `2.7.7`, `2.7.7-debian-10-r20`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.7.7-debian-10-r20/2/debian-10/Dockerfile)
+- [`2`, `2-debian-10`, `2.7.7`, `2.7.7-debian-10-r21`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.7.7-debian-10-r21/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/discourse GitHub repo](https://github.com/bitnami/bitnami-docker-discourse).
 
diff --git a/bitnami/discourse/docker-compose.yml b/bitnami/discourse/docker-compose.yml
index 4fb47f1f7d9b..b1c7febe8eaf 100644
--- a/bitnami/discourse/docker-compose.yml
+++ b/bitnami/discourse/docker-compose.yml
@@ -5,12 +5,14 @@ services:
     volumes:
       - 'postgresql_data:/bitnami/postgresql'
     environment:
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
       - POSTGRESQL_USERNAME=bn_discourse
       - POSTGRESQL_DATABASE=bitnami_discourse
   redis:
     image: docker.io/bitnami/redis:6.0
     environment:
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'redis_data:/bitnami/discourse'
@@ -24,6 +26,7 @@ services:
       - postgresql
       - redis
     environment:
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
       - DISCOURSE_HOST=www.example.com
       - DISCOURSE_DATABASE_HOST=postgresql
@@ -43,6 +46,7 @@ services:
       - 'sidekiq_data:/bitnami/discourse'
     command: /opt/bitnami/scripts/discourse-sidekiq/run.sh
     environment:
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
       - DISCOURSE_HOST=www.example.com
       - DISCOURSE_DATABASE_HOST=postgresql