diff --git a/.gitea/workflows/generate-iso.yaml b/.gitea/workflows/generate-iso.yaml
index a7ab181..cb6f4be 100644
--- a/.gitea/workflows/generate-iso.yaml
+++ b/.gitea/workflows/generate-iso.yaml
@@ -137,7 +137,7 @@ jobs:
           mkdir -p opt/livebuild/config/hooks/normal
           touch opt/livebuild/config/hooks/normal/0000-fix-dev.chroot
           chmod 0775 opt/livebuild/config/hooks/normal/0000-fix-dev.chroot
-          printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ Creating opt/livebuild/config/hooks/normal/0000-fix-dev.chroot. \e[0m\n"
+          printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ Creating 'opt/livebuild/config/hooks/normal/0000-fix-dev.chroot'. \e[0m\n"
           cat << 'EOF' >| opt/livebuild/config/hooks/normal/0000-fix-dev.chroot
           #!/bin/bash
           # SPDX-Version: 3.0
@@ -159,13 +159,13 @@ jobs:
           fi
           chmod 666 /dev/null
           EOF
-          printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ Creating opt/livebuild/config/hooks/normal/0000-fix-dev.chroot. \e[0m\n"
+          printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ Creating 'opt/livebuild/config/hooks/normal/0000-fix-dev.chroot'. \e[0m\n"
           ls -l opt/livebuild/config/hooks/normal/0000-fix-dev.chroot
           ###
           mkdir -p opt/livebuild/config/hooks/early
           touch opt/livebuild/config/hooks/early/0000-fix-dev
           chmod 0775 opt/livebuild/config/hooks/early/0000-fix-dev
-          printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ Creating opt/livebuild/config/hooks/early/0000-fix-dev. \e[0m\n"
+          printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ 'Creating opt/livebuild/config/hooks/early/0000-fix-dev'. \e[0m\n"
           cat << 'EOF' >| opt/livebuild/config/hooks/early/0000-fix-dev
           #!/bin/bash
           # SPDX-Version: 3.0
@@ -189,8 +189,8 @@ jobs:
           fi
           chmod 666 "${CHROOT}/dev/null"
           EOF
-          printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ Creating opt/livebuild/config/hooks/early/0000-fix-dev. \e[0m\n"
-          ls -l opt/livebuild/config/hooks/normal/0000-fix-dev.chroot
+          printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ Creating 'opt/livebuild/config/hooks/early/0000-fix-dev'. \e[0m\n"
+          ls -l opt/livebuild/config/hooks/early/0000-fix-dev
           ###
 
       - name: Starting CISS.debian.live.builder. This may take a while ...
diff --git a/ciss_live_builder.sh b/ciss_live_builder.sh
index feb7e7a..93b209f 100644
--- a/ciss_live_builder.sh
+++ b/ciss_live_builder.sh
@@ -101,7 +101,9 @@ declare -gr ARGUMENTS_COUNT="$#"
 declare -gr ARG_STR_ORG_INPUT="$*"
 #declare -ar ARG_ARY_ORG_INPUT=("$@")
 # shellcheck disable=SC2155
-declare -gr SCRIPT_FULLPATH="$(readlink -f "${BASH_SOURCE[0]:-$0}")"
+declare -grx SCRIPT_FULLPATH="$(readlink -f "${BASH_SOURCE[0]:-$0}")"
+# shellcheck disable=SC2155
+declare -grx SCRIPT_BASEPATH="$(dirname "${SCRIPT_FULLPATH}")"
 # shellcheck disable=SC2155
 declare -grx VAR_WORKDIR="$(dirname "${SCRIPT_FULLPATH}")"
 
diff --git a/lib/lib_lb_build_start.sh b/lib/lib_lb_build_start.sh
index 9580ba5..532a5ec 100644
--- a/lib/lib_lb_build_start.sh
+++ b/lib/lib_lb_build_start.sh
@@ -23,6 +23,8 @@ lb_build_start() {
   printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ 🔨 Start Build... Log file: %s \e[0m\n" "${VAR_BUILD_LOG}"
   # sleep 1
 
+  # shellcheck disable=SC2164
+  cd "${SCRIPT_BASEPATH}"
   # shellcheck disable=SC2164
   cd "${VAR_HANDLER_BUILD_DIR}"