diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile
index 0f685410c797..7454ced1bc8d 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile
+++ b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile
@@ -18,7 +18,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/spring-cloud-dataflow/postunpack.sh
 ENV BITNAMI_APP_NAME="spring-cloud-dataflow" \
-    BITNAMI_IMAGE_VERSION="2.8.2-debian-10-r6" \
+    BITNAMI_IMAGE_VERSION="2.8.2-debian-10-r7" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
 
 USER 1001
diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
index ae8f310137d2..0b96a0be09e0 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -137,6 +137,19 @@ generate_cron_conf() {
     fi
 }
 
+########################
+# Remove a cron configuration file for a given service
+# Arguments:
+#   $1 - Service name
+# Returns:
+#   None
+#########################
+remove_cron_conf() {
+    local service_name="${1:?service name is missing}"
+    local cron_conf_dir="/etc/monit/conf.d"
+    rm -f "${cron_conf_dir}/${service_name}"
+}
+
 ########################
 # Generate a monit configuration file for a given service
 # Arguments:
@@ -183,6 +196,19 @@ check process ${service_name}
 EOF
 }
 
+########################
+# Remove a monit configuration file for a given service
+# Arguments:
+#   $1 - Service name
+# Returns:
+#   None
+#########################
+remove_monit_conf() {
+    local service_name="${1:?service name is missing}"
+    local monit_conf_dir="/etc/monit/conf.d"
+    rm -f "${monit_conf_dir}/${service_name}.conf"
+}
+
 ########################
 # Generate a logrotate configuration file
 # Arguments:
@@ -233,3 +259,16 @@ $(indent "$extra" 2)
 }
 EOF
 }
+
+########################
+# Remove a logrotate configuration file
+# Arguments:
+#   $1 - Service name
+# Returns:
+#   None
+#########################
+remove_logrotate_conf() {
+    local service_name="${1:?service name is missing}"
+    local logrotate_conf_dir="/etc/logrotate.d"
+    rm -f "${logrotate_conf_dir}/${service_name}"
+}
diff --git a/bitnami/spring-cloud-dataflow/README.md b/bitnami/spring-cloud-dataflow/README.md
index 238c6dd8848e..a48c3f2e859c 100644
--- a/bitnami/spring-cloud-dataflow/README.md
+++ b/bitnami/spring-cloud-dataflow/README.md
@@ -39,7 +39,7 @@ Non-root container images add an extra layer of security and are generally recom
 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.8.2`, `2.8.2-debian-10-r6`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.8.2-debian-10-r6/2/debian-10/Dockerfile)
+* [`2`, `2-debian-10`, `2.8.2`, `2.8.2-debian-10-r7`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.8.2-debian-10-r7/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/spring-cloud-dataflow GitHub repo](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow).