diff --git a/bitnami/spring-cloud-skipper/2/debian-10/Dockerfile b/bitnami/spring-cloud-skipper/2/debian-10/Dockerfile
index a651e212913d..7b3ebe1f8c04 100644
--- a/bitnami/spring-cloud-skipper/2/debian-10/Dockerfile
+++ b/bitnami/spring-cloud-skipper/2/debian-10/Dockerfile
@@ -18,7 +18,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/spring-cloud-skipper/postunpack.sh
 ENV BITNAMI_APP_NAME="spring-cloud-skipper" \
-    BITNAMI_IMAGE_VERSION="2.6.1-debian-10-r71" \
+    BITNAMI_IMAGE_VERSION="2.6.1-debian-10-r72" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
 
 USER 1001
diff --git a/bitnami/spring-cloud-skipper/2/debian-10/docker-compose.yml b/bitnami/spring-cloud-skipper/2/debian-10/docker-compose.yml
index 7af83b0ced60..eddaf3fcf303 100644
--- a/bitnami/spring-cloud-skipper/2/debian-10/docker-compose.yml
+++ b/bitnami/spring-cloud-skipper/2/debian-10/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   spring-cloud-skipper:
-    image: 'docker.io/bitnami/spring-cloud-skipper:2-debian-10'
+    image: docker.io/bitnami/spring-cloud-skipper:2
     environment:
       - SERVER_PORT=7577
       - SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_PORTRANGE_LOW=20000
@@ -17,7 +17,7 @@ services:
     depends_on:
       - mariadb
   mariadb:
-    image: 'docker.io/bitnami/mariadb:10.3-debian-10'
+    image: docker.io/bitnami/mariadb:10.3
     environment:
       - MARIADB_ROOT_PASSWORD=root_password
       - MARIADB_USER=bn_skipper
diff --git a/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh
index 60ec4cbfc32a..c7c0f6d4422a 100644
--- a/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh
+++ b/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh
@@ -106,5 +106,7 @@ indent() {
     for ((i = 0; i < num; i++)); do
         indent_unit="${indent_unit}${char}"
     done
+    # shellcheck disable=SC2001
+    # Complex regex, see https://github.com/koalaman/shellcheck/wiki/SC2001#exceptions
     echo "$string" | sed "s/^/${indent_unit}/"
 }
diff --git a/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
index 66d4f457bdd2..f3bc7568bfa5 100644
--- a/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -9,7 +9,7 @@
 
 # Functions
 ########################
-# Gets semantic version 
+# Gets semantic version
 # Arguments:
 #   $1 - version: string to extract major.minor.patch
 #   $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch
@@ -38,7 +38,7 @@ get_sematic_version () {
         done
 
         local number_regex='^[0-9]+$'
-        if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then
+        if [[ "$section" =~ $number_regex ]] && (( section > 0 )) && (( section <= 3 )); then
              echo "${version_sections[$section]}"
              return
         else
diff --git a/bitnami/spring-cloud-skipper/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-skipper/run.sh b/bitnami/spring-cloud-skipper/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-skipper/run.sh
index e427f86fd627..813427b2d3d8 100755
--- a/bitnami/spring-cloud-skipper/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-skipper/run.sh
+++ b/bitnami/spring-cloud-skipper/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-skipper/run.sh
@@ -2,7 +2,7 @@
 #
 # Bitnami Spring Cloud Skipper run
 
-# shellcheck disable=SC1091
+# shellcheck disable=SC1091,SC2153
 
 set -o errexit
 set -o nounset
@@ -19,7 +19,9 @@ set -o pipefail
 info "** Starting Spring Cloud Skipper **"
 
 __run_cmd="java"
-__run_flags=($JAVA_OPTS "-jar" "-Duser.home=${HOME}" "${SPRING_CLOUD_SKIPPER_BASE_DIR}/spring-cloud-skipper.jar" "--spring.config.additional-location=${SPRING_CLOUD_SKIPPER_CONF_FILE}" "$@")
+read -r -a java_opts <<< "$JAVA_OPTS"
+__run_flags=("-jar" "-Duser.home=${HOME}" "${SPRING_CLOUD_SKIPPER_BASE_DIR}/spring-cloud-skipper.jar" "--spring.config.additional-location=${SPRING_CLOUD_SKIPPER_CONF_FILE}" "$@")
+[[ "${#java_opts[@]}" -gt 0 ]] && __run_flags=("${java_opts[@]}" "${__run_flags[@]}")
 
 if am_i_root; then
     exec gosu "$SPRING_CLOUD_SKIPPER_DAEMON_USER" "$__run_cmd" "${__run_flags[@]}"
diff --git a/bitnami/spring-cloud-skipper/README.md b/bitnami/spring-cloud-skipper/README.md
index 28a160f15a8b..ca6d39523a3e 100644
--- a/bitnami/spring-cloud-skipper/README.md
+++ b/bitnami/spring-cloud-skipper/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.6.1`, `2.6.1-debian-10-r71`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper/blob/2.6.1-debian-10-r71/2/debian-10/Dockerfile)
+* [`2`, `2-debian-10`, `2.6.1`, `2.6.1-debian-10-r72`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper/blob/2.6.1-debian-10-r72/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/spring-cloud-skipper GitHub repo](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper).
 
diff --git a/bitnami/spring-cloud-skipper/docker-compose.yml b/bitnami/spring-cloud-skipper/docker-compose.yml
index 7af83b0ced60..eddaf3fcf303 100644
--- a/bitnami/spring-cloud-skipper/docker-compose.yml
+++ b/bitnami/spring-cloud-skipper/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   spring-cloud-skipper:
-    image: 'docker.io/bitnami/spring-cloud-skipper:2-debian-10'
+    image: docker.io/bitnami/spring-cloud-skipper:2
     environment:
       - SERVER_PORT=7577
       - SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_PORTRANGE_LOW=20000
@@ -17,7 +17,7 @@ services:
     depends_on:
       - mariadb
   mariadb:
-    image: 'docker.io/bitnami/mariadb:10.3-debian-10'
+    image: docker.io/bitnami/mariadb:10.3
     environment:
       - MARIADB_ROOT_PASSWORD=root_password
       - MARIADB_USER=bn_skipper