diff --git a/bitnami/wavefront-proxy/10/debian-10/Dockerfile b/bitnami/wavefront-proxy/10/debian-10/Dockerfile
index 3e8394eeb764..05252a2114ba 100644
--- a/bitnami/wavefront-proxy/10/debian-10/Dockerfile
+++ b/bitnami/wavefront-proxy/10/debian-10/Dockerfile
@@ -17,7 +17,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/wavefront-proxy/postunpack.sh
 ENV BITNAMI_APP_NAME="wavefront-proxy" \
-    BITNAMI_IMAGE_VERSION="10.9.0-debian-10-r10" \
+    BITNAMI_IMAGE_VERSION="10.9.0-debian-10-r11" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 2878
diff --git a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
index 0b96a0be09e0..a713bd108e15 100644
--- a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -158,7 +158,7 @@ remove_cron_conf() {
 #   $3 - Start command
 #   $4 - Stop command
 # Flags:
-#   --disabled - Whether to disable the monit configuration
+#   --disable - Whether to disable the monit configuration
 # Returns:
 #   None
 #########################
@@ -174,9 +174,8 @@ generate_monit_conf() {
     shift 4
     while [[ "$#" -gt 0 ]]; do
         case "$1" in
-            --disabled)
-                shift
-                disabled="$1"
+            --disable)
+                disabled="yes"
                 ;;
             *)
                 echo "Invalid command line flag ${1}" >&2
diff --git a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index dc322c377b1b..785d883f325e 100644
--- a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -164,11 +164,14 @@ web_server_reload() {
 # Arguments:
 #   $1 - App name
 # Flags:
-#   --hosts - Hosts to enable
 #   --type - Application type, which has an effect on which configuration template to use
+#   --hosts - Host listen addresses
+#   --server-name - Server name
+#   --server-aliases - Server aliases
 #   --allow-remote-connections - Whether to allow remote connections or to require local connections
-#   --disabled - Whether to render the file with a .disabled prefix
-#   --enable-https - Enable app configuration on HTTPS port
+#   --disable - Whether to render server configurations with a .disabled prefix
+#   --disable-http - Whether to render the app's HTTP server configuration with a .disabled prefix
+#   --disable-https - Whether to render the app's HTTPS server configuration with a .disabled prefix
 #   --http-port - HTTP port number
 #   --https-port - HTTPS port number
 #   --document-root - Path to document root directory
@@ -198,11 +201,18 @@ ensure_web_server_app_configuration_exists() {
     while [[ "$#" -gt 0 ]]; do
         case "$1" in
             # Common flags
+            --disable \
+            | --disable-http \
+            | --disable-https \
+            )
+                apache_args+=("$1")
+                nginx_args+=("$1")
+                ;;
             --hosts \
+            | --server-name \
+            | --server-aliases \
             | --type \
             | --allow-remote-connections \
-            | --disabled \
-            | --enable-https \
             | --http-port \
             | --https-port \
             | --document-root \
@@ -347,8 +357,13 @@ ensure_web_server_prefix_configuration_exists() {
 # Arguments:
 #   $1 - App name
 # Flags:
-#   --hosts - Hosts to enable
-#   --enable-https - Update HTTPS app configuration
+#   --hosts - Host listen addresses
+#   --server-name - Server name
+#   --server-aliases - Server aliases
+#   --enable-http - Enable HTTP app configuration (if not enabled already)
+#   --enable-https - Enable HTTPS app configuration (if not enabled already)
+#   --disable-http - Disable HTTP app configuration (if not disabled already)
+#   --disable-https - Disable HTTPS app configuration (if not disabled already)
 #   --http-port - HTTP port number
 #   --https-port - HTTPS port number
 # Returns:
@@ -363,8 +378,20 @@ web_server_update_app_configuration() {
     while [[ "$#" -gt 0 ]]; do
         case "$1" in
             # Common flags
-            --hosts \
+            --enable-http \
             | --enable-https \
+            | --disable-http \
+            | --disable-https \
+            )
+                args+=("$1")
+                ;;
+            --hosts \
+            | --server-name \
+            | --server-aliases \
+            | --enable-http \
+            | --enable-https \
+            | --disable-http \
+            | --disable-https \
             | --http-port \
             | --https-port \
             )
diff --git a/bitnami/wavefront-proxy/README.md b/bitnami/wavefront-proxy/README.md
index 26844a531979..f215bd8b4e53 100644
--- a/bitnami/wavefront-proxy/README.md
+++ b/bitnami/wavefront-proxy/README.md
@@ -28,7 +28,7 @@ $ docker run --name wavefront-proxy bitnami/wavefront-proxy:latest
 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/).
 
 
-* [`10`, `10-debian-10`, `10.9.0`, `10.9.0-debian-10-r10`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wavefront-proxy/blob/10.9.0-debian-10-r10/10/debian-10/Dockerfile)
+* [`10`, `10-debian-10`, `10.9.0`, `10.9.0-debian-10-r11`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wavefront-proxy/blob/10.9.0-debian-10-r11/10/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wavefront-proxy GitHub repo](https://github.com/bitnami/bitnami-docker-wavefront-proxy).