diff --git a/bitnami/osclass/8/debian-10/Dockerfile b/bitnami/osclass/8/debian-10/Dockerfile
index eaa757fe6d53..52531ab33e8d 100644
--- a/bitnami/osclass/8/debian-10/Dockerfile
+++ b/bitnami/osclass/8/debian-10/Dockerfile
@@ -29,7 +29,7 @@ RUN /opt/bitnami/scripts/osclass/postunpack.sh
 ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="osclass" \
-    BITNAMI_IMAGE_VERSION="8.0.1-debian-10-r20" \
+    BITNAMI_IMAGE_VERSION="8.0.1-debian-10-r21" \
     PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
index 10a4cf70c378..5a8bae06cbcc 100644
--- a/bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
+++ b/bitnami/osclass/8/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
@@ -347,7 +347,7 @@ ensure_apache_app_configuration_exists() {
     # Default options
     local type=""
     local -a hosts=("127.0.0.1" "_default_")
-    local server_name
+    local server_name="www.example.com" # Default ServerName in httpd.conf
     local -a server_aliases=("*")
     local allow_remote_connections="yes"
     local disable="no"
@@ -653,7 +653,7 @@ apache_update_app_configuration() {
     local -r app="${1:?missing app}"
     # Default options
     local -a hosts=("127.0.0.1" "_default_")
-    local server_name
+    local server_name="www.example.com" # Default ServerName in httpd.conf
     local -a server_aliases=()
     local enable_http="no"
     local enable_https="no"
diff --git a/bitnami/osclass/README.md b/bitnami/osclass/README.md
index dc5c652330fe..fd56251af23f 100644
--- a/bitnami/osclass/README.md
+++ b/bitnami/osclass/README.md
@@ -43,7 +43,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`, `8-debian-10`, `8.0.1`, `8.0.1-debian-10-r20` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/8.0.1-debian-10-r20/8/debian-10/Dockerfile)
+- [`8`, `8-debian-10`, `8.0.1`, `8.0.1-debian-10-r21` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-osclass/blob/8.0.1-debian-10-r21/8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/osclass GitHub repo](https://github.com/bitnami/bitnami-docker-osclass).