diff --git a/bitnami/spring-cloud-skipper/2/debian-10/Dockerfile b/bitnami/spring-cloud-skipper/2/debian-10/Dockerfile
index 538331943a5a..c9e76ea47706 100644
--- a/bitnami/spring-cloud-skipper/2/debian-10/Dockerfile
+++ b/bitnami/spring-cloud-skipper/2/debian-10/Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update && apt-get upgrade -y && \
 COPY rootfs /
 RUN /opt/bitnami/scripts/spring-cloud-skipper/postunpack.sh
 ENV BITNAMI_APP_NAME="spring-cloud-skipper" \
-    BITNAMI_IMAGE_VERSION="2.4.2-debian-10-r4" \
+    BITNAMI_IMAGE_VERSION="2.4.2-debian-10-r5" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
 
 USER 1001
diff --git a/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 257c4297590a..8f37ecbd823e 100644
--- a/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -106,7 +106,7 @@ is_file_writable() {
 relativize() {
     local -r path="${1:?missing path}"
     local -r base="${2:?missing base}"
-    pushd / >/dev/null
+    pushd "$base" >/dev/null
     realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||'
     popd >/dev/null
 }
diff --git a/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
index dce83ffca153..6e42c882dbff 100644
--- a/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
+++ b/bitnami/spring-cloud-skipper/2/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
@@ -39,6 +39,10 @@ persist_app() {
     local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder
     local -r tmp_file="/tmp/perms.acl"
     for file_to_persist in "${files_to_persist[@]}"; do
+        if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then
+            error "Cannot persist '${file_to_persist}' because it does not exist"
+            return 1
+        fi
         file_to_persist_relative="$(relativize "$file_to_persist" "$install_dir")"
         file_to_persist_destination="${persist_dir}/${file_to_persist_relative}"
         file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")"
diff --git a/bitnami/spring-cloud-skipper/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-skipper-env.sh b/bitnami/spring-cloud-skipper/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-skipper-env.sh
index da05ac7c0a07..4c2085b54a92 100644
--- a/bitnami/spring-cloud-skipper/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-skipper-env.sh
+++ b/bitnami/spring-cloud-skipper/2/debian-10/rootfs/opt/bitnami/scripts/spring-cloud-skipper-env.sh
@@ -23,6 +23,7 @@ spring_cloud_skipper_env_vars=(
     SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API
     SPRING_CLOUD_KUBERNETES_CONFIG_NAME
     SPRING_CLOUD_KUBERNETES_SECRETS_PATHS
+    JAVA_OPTS
 
 )
 for env_var in "${spring_cloud_skipper_env_vars[@]}"; do
@@ -45,9 +46,6 @@ export SPRING_CLOUD_SKIPPER_M2_DIR="/.m2"
 export SPRING_CLOUD_SKIPPER_DAEMON_USER="dataflow"
 export SPRING_CLOUD_SKIPPER_DAEMON_GROUP="dataflow"
 
-# Java settings
-export JAVA_OPTS="${JAVA_OPTS:-}"
-
 # Dataflow settings
 export SERVER_PORT="${SERVER_PORT:-}"
 export SPRING_CLOUD_CONFIG_ENABLED="${SPRING_CLOUD_CONFIG_ENABLED:-false}"
@@ -55,4 +53,7 @@ export SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API="${SPRING_CLOUD_KUBERNETES_SEC
 export SPRING_CLOUD_KUBERNETES_CONFIG_NAME="${SPRING_CLOUD_KUBERNETES_CONFIG_NAME:-}"
 export SPRING_CLOUD_KUBERNETES_SECRETS_PATHS="${SPRING_CLOUD_KUBERNETES_SECRETS_PATHS:-}"
 
+# Java settings
+export JAVA_OPTS="${JAVA_OPTS:-}"
+
 # Custom environment variables may be defined below
diff --git a/bitnami/spring-cloud-skipper/README.md b/bitnami/spring-cloud-skipper/README.md
index c8bd2af65676..f464d7228c2f 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-debian-10`, `2.4.2-debian-10-r4`, `2`, `2.4.2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper/blob/2.4.2-debian-10-r4/2/debian-10/Dockerfile)
+* [`2-debian-10`, `2.4.2-debian-10-r5`, `2`, `2.4.2`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-skipper/blob/2.4.2-debian-10-r5/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).