diff --git a/10/jdk/alpine/slim-java.sh b/10/jdk/alpine/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/10/jdk/alpine/slim-java.sh
+++ b/10/jdk/alpine/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/10/jdk/ubuntu/slim-java.sh b/10/jdk/ubuntu/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/10/jdk/ubuntu/slim-java.sh
+++ b/10/jdk/ubuntu/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/11/jdk/alpine/slim-java.sh b/11/jdk/alpine/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/11/jdk/alpine/slim-java.sh
+++ b/11/jdk/alpine/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/11/jdk/centos/slim-java.sh b/11/jdk/centos/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/11/jdk/centos/slim-java.sh
+++ b/11/jdk/centos/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/11/jdk/clefos/slim-java.sh b/11/jdk/clefos/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/11/jdk/clefos/slim-java.sh
+++ b/11/jdk/clefos/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/11/jdk/debian/slim-java.sh b/11/jdk/debian/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/11/jdk/debian/slim-java.sh
+++ b/11/jdk/debian/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/11/jdk/ubi/slim-java.sh b/11/jdk/ubi/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/11/jdk/ubi/slim-java.sh
+++ b/11/jdk/ubi/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/11/jdk/ubuntu/slim-java.sh b/11/jdk/ubuntu/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/11/jdk/ubuntu/slim-java.sh
+++ b/11/jdk/ubuntu/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/12/jdk/alpine/slim-java.sh b/12/jdk/alpine/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/12/jdk/alpine/slim-java.sh
+++ b/12/jdk/alpine/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/12/jdk/debian/slim-java.sh b/12/jdk/debian/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/12/jdk/debian/slim-java.sh
+++ b/12/jdk/debian/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/12/jdk/ubuntu/slim-java.sh b/12/jdk/ubuntu/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/12/jdk/ubuntu/slim-java.sh
+++ b/12/jdk/ubuntu/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/13/jdk/alpine/slim-java.sh b/13/jdk/alpine/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/13/jdk/alpine/slim-java.sh
+++ b/13/jdk/alpine/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/13/jdk/centos/slim-java.sh b/13/jdk/centos/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/13/jdk/centos/slim-java.sh
+++ b/13/jdk/centos/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/13/jdk/clefos/slim-java.sh b/13/jdk/clefos/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/13/jdk/clefos/slim-java.sh
+++ b/13/jdk/clefos/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/13/jdk/debian/slim-java.sh b/13/jdk/debian/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/13/jdk/debian/slim-java.sh
+++ b/13/jdk/debian/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/13/jdk/ubi/slim-java.sh b/13/jdk/ubi/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/13/jdk/ubi/slim-java.sh
+++ b/13/jdk/ubi/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/13/jdk/ubuntu/slim-java.sh b/13/jdk/ubuntu/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/13/jdk/ubuntu/slim-java.sh
+++ b/13/jdk/ubuntu/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/8/jdk/alpine/slim-java.sh b/8/jdk/alpine/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/8/jdk/alpine/slim-java.sh
+++ b/8/jdk/alpine/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/8/jdk/centos/slim-java.sh b/8/jdk/centos/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/8/jdk/centos/slim-java.sh
+++ b/8/jdk/centos/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/8/jdk/clefos/slim-java.sh b/8/jdk/clefos/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/8/jdk/clefos/slim-java.sh
+++ b/8/jdk/clefos/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/8/jdk/debian/slim-java.sh b/8/jdk/debian/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/8/jdk/debian/slim-java.sh
+++ b/8/jdk/debian/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/8/jdk/ubi/slim-java.sh b/8/jdk/ubi/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/8/jdk/ubi/slim-java.sh
+++ b/8/jdk/ubi/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/8/jdk/ubuntu/slim-java.sh b/8/jdk/ubuntu/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/8/jdk/ubuntu/slim-java.sh
+++ b/8/jdk/ubuntu/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/9/jdk/alpine/slim-java.sh b/9/jdk/alpine/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/9/jdk/alpine/slim-java.sh
+++ b/9/jdk/alpine/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/9/jdk/ubuntu/slim-java.sh b/9/jdk/ubuntu/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/9/jdk/ubuntu/slim-java.sh
+++ b/9/jdk/ubuntu/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then
diff --git a/build_latest.sh b/build_latest.sh
index fa3d490c7..e8d3fdcbc 100755
--- a/build_latest.sh
+++ b/build_latest.sh
@@ -55,7 +55,8 @@ function build_image() {
 	echo "#####################################################"
 	echo "INFO: docker build --no-cache ${tags} -f ${dockerfile} ."
 	echo "#####################################################"
-	if ! docker build --pull --no-cache "${tags}" -f "${dockerfile}" . ; then
+	# shellcheck disable=SC2086 # ignoring ${tags} due to whitespace problem
+	if ! docker build --pull --no-cache ${tags} -f "${dockerfile}" . ; then
 		echo "ERROR: Docker build of image: ${tags} from ${dockerfile} failed."
 		exit 1
 	fi
diff --git a/slim-java.sh b/slim-java.sh
index 356ed752d..db2b8db2e 100755
--- a/slim-java.sh
+++ b/slim-java.sh
@@ -106,7 +106,7 @@ function jre_lib_files() {
 		# Derive arch from current platorm.
 		lib_arch_dir=$(parse_platform_specific)
 		if [ -d "${lib_arch_dir}" ]; then
-			pushd "${lib_arch_dir}" >/dev/null
+			pushd "${lib_arch_dir}" >/dev/null || return
 				rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
 				# Only remove the default dir for 64bit versions
 				if [ "${proc_type}" == "64bit" ]; then