diff --git a/bitnami/discourse/2/debian-10/Dockerfile b/bitnami/discourse/2/debian-10/Dockerfile
index 83f6c0288975..795594927d29 100644
--- a/bitnami/discourse/2/debian-10/Dockerfile
+++ b/bitnami/discourse/2/debian-10/Dockerfile
@@ -22,7 +22,7 @@ RUN /opt/bitnami/ruby/bin/gem install --force bundler -v '< 2'
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="discourse" \
-    BITNAMI_IMAGE_VERSION="2.5.0-debian-10-r4" \
+    BITNAMI_IMAGE_VERSION="2.5.0-debian-10-r5" \
     DISCOURSE_EMAIL="user@example.com" \
     DISCOURSE_HOST="discourse" \
     DISCOURSE_HOSTNAME="127.0.0.1" \
diff --git a/bitnami/discourse/2/debian-10/docker-compose.yml b/bitnami/discourse/2/debian-10/docker-compose.yml
index d3f0c72c61af..7ae4d642969c 100644
--- a/bitnami/discourse/2/debian-10/docker-compose.yml
+++ b/bitnami/discourse/2/debian-10/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     volumes:
       - 'postgresql_data:/bitnami/postgresql'
   redis:
-    image: 'docker.io/bitnami/redis:5.0-debian-10'
+    image: 'docker.io/bitnami/redis:6.0-debian-10'
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
diff --git a/bitnami/discourse/2/debian-10/prebuildfs/usr/sbin/bitnami-pkg b/bitnami/discourse/2/debian-10/prebuildfs/usr/sbin/bitnami-pkg
index eb0ea3c02952..23c94a6fd196 100755
--- a/bitnami/discourse/2/debian-10/prebuildfs/usr/sbin/bitnami-pkg
+++ b/bitnami/discourse/2/debian-10/prebuildfs/usr/sbin/bitnami-pkg
@@ -189,6 +189,15 @@ case "$1" in
 esac
 
 nami $1 $PACKAGE $PACKAGE_ARGS
+
+if [[ $PACKAGE =~ git-.* ]]; then
+  # Due to a nami unpack issue, git binaries are copied instead of using hard symlinks.
+  # This workaround overwrites these binaries with the original ones, preserving links
+  # and saving ~500 MB
+  info "Patching ${PACKAGE}"
+  cp -a --force "${INSTALL_ROOT}/${PACKAGE}/files/git/." "/opt/bitnami/git"
+fi
+
 rm -rf $INSTALL_ROOT
 
 if [ "$BITNAMI_PKG_EXTRA_DIRS" ]; then
diff --git a/bitnami/discourse/README.md b/bitnami/discourse/README.md
index f1be67be5c7d..5368ebf2fca2 100644
--- a/bitnami/discourse/README.md
+++ b/bitnami/discourse/README.md
@@ -33,7 +33,7 @@ $ docker-compose up -d
 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-debian-10`, `2.5.0-debian-10-r4`, `2`, `2.5.0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.5.0-debian-10-r4/2/debian-10/Dockerfile)
+* [`2-debian-10`, `2.5.0-debian-10-r5`, `2`, `2.5.0`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-discourse/blob/2.5.0-debian-10-r5/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 d3f0c72c61af..7ae4d642969c 100644
--- a/bitnami/discourse/docker-compose.yml
+++ b/bitnami/discourse/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     volumes:
       - 'postgresql_data:/bitnami/postgresql'
   redis:
-    image: 'docker.io/bitnami/redis:5.0-debian-10'
+    image: 'docker.io/bitnami/redis:6.0-debian-10'
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
     volumes: