diff --git a/assemble_image.sh b/assemble_image.sh
index 88e47df4e17cbdca465893812e31ba94ecacb866..ae18e31e8a6e3cf848daf390948ad87177be0678 100755
--- a/assemble_image.sh
+++ b/assemble_image.sh
@@ -14,9 +14,9 @@ ISO_PROFILES_REPO="$REGULAR_USER_HOME/iso-profiles"
 PROFILE="$ISO_PROFILES_REPO/osak/lip"
 
 rm -rf "$ISO_PROFILES_REPO"
-rm -rf workspace
-mkdir workspace
-chmod a+rx workspace
+rm -rf "$WORKSPACE"
+mkdir "$WORKSPACE"
+chmod a+rx "$WORKSPACE"
 git clone --depth 1 https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git "$ISO_PROFILES_REPO"
 mkdir -p "$PROFILE"
 rsync -a --copy-links "$ISO_PROFILES_REPO/manjaro/kde/" "$PROFILE"
@@ -131,7 +131,7 @@ install_custom_calamares() {
   local CACHE="${XDG_CACHE_HOME:-"$HOME/.cache"}/lip-build/calamares-build"
   if [ "$REBUILD_CALAMARES" -ne 0 ] || ! ls "$CACHE"/calamares*.pkg.tar.* > /dev/null 2&>1
   then
-    local BUILD_DIR="workspace/calamares-build"
+    local BUILD_DIR="$WORKSPACE/calamares-build"
     mkdir -p "$BUILD_DIR"
     cp "calamares/PKGBUILD" "$BUILD_DIR"
     cd "$BUILD_DIR"