diff --git a/src/minimal_overlay/bundles/felix/01_get.sh b/src/minimal_overlay/bundles/felix/01_get.sh
index 2f0133189..0a1707b56 100755
--- a/src/minimal_overlay/bundles/felix/01_get.sh
+++ b/src/minimal_overlay/bundles/felix/01_get.sh
@@ -2,10 +2,7 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
 # Grab everything after the '=' character.
 DOWNLOAD_URL=$(grep -i FELIX_SOURCE_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=')
@@ -33,12 +30,12 @@ fi
 
 # Delete folder with previously extracted Felix.
 echo "Removing Apache Felix work area. This may take a while..."
-rm -rf ../../work/overlay/felix
-mkdir ../../work/overlay/felix
+rm -rf $WORK_DIR/overlay/felix
+mkdir $WORK_DIR/overlay/felix
 
 # Extract Felix to folder 'work/overlay/felix'.
 # Full path will be something like 'work/overlay/felix/felix-framework-5.4.0'.
-tar -xvf $ARCHIVE_FILE -C ../../work/overlay/felix
+tar -xvf $ARCHIVE_FILE -C $WORK_DIR/overlay/felix
 
 cd $SRC_DIR
 
diff --git a/src/minimal_overlay/bundles/felix/02_install.sh b/src/minimal_overlay/bundles/felix/02_install.sh
index 0b90d86bf..a90cdf4ef 100755
--- a/src/minimal_overlay/bundles/felix/02_install.sh
+++ b/src/minimal_overlay/bundles/felix/02_install.sh
@@ -2,17 +2,14 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
 echo "Removing old Apache Felix artifacts. This may take a while..."
-rm -rf $MAIN_SRC_DIR/work/overlay/felix/felix_installed
-mkdir -p $MAIN_SRC_DIR/work/overlay/felix/felix_installed/opt/felix
-mkdir -p $MAIN_SRC_DIR/work/overlay/felix/felix_installed/bin
+rm -rf $WORK_DIR/overlay/felix/felix_installed
+mkdir -p $WORK_DIR/overlay/felix/felix_installed/opt/felix
+mkdir -p $WORK_DIR/overlay/felix/felix_installed/bin
 
-cd $MAIN_SRC_DIR/work/overlay/felix
+cd $WORK_DIR/overlay/felix
 cd $(ls -d felix-*)
 
 cat << CEOF > bin/felix-start.sh
@@ -25,14 +22,14 @@ CEOF
 
 chmod +rx bin/felix-start.sh
 
-cp -r * $MAIN_SRC_DIR/work/overlay/felix/felix_installed/opt/felix
+cp -r * $WORK_DIR/overlay/felix/felix_installed/opt/felix
 
-cd $MAIN_SRC_DIR/work/overlay/felix/felix_installed
+cd $WORK_DIR/overlay/felix/felix_installed
 
 ln -s ../opt/felix/bin/felix-start.sh bin/felix-start
 
-cp -r $MAIN_SRC_DIR/work/overlay/felix/felix_installed/* \
-  $MAIN_SRC_DIR/work/src/minimal_overlay/rootfs
+cp -r $WORK_DIR/overlay/felix/felix_installed/* \
+  $WORK_DIR/src/minimal_overlay/rootfs
 
 echo "Apache Felix has been installed."
 
diff --git a/src/minimal_overlay/bundles/glibc_full/bundle.sh b/src/minimal_overlay/bundles/glibc_full/bundle.sh
index 010e104f4..eab2caf87 100755
--- a/src/minimal_overlay/bundles/glibc_full/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_full/bundle.sh
@@ -4,7 +4,7 @@ SRC_DIR=$(pwd)
 
 . ../../common.sh
 
-if [ ! -d $WORK_DIR/glibc/glibc_prepared ] ; then
+if [ ! -d $SYSROOT ] ; then
   echo "Cannot continue - GLIBC is missing. Please buld GLIBC first."
   exit 1
 fi
diff --git a/src/minimal_overlay/bundles/java/bundle.sh b/src/minimal_overlay/bundles/java/bundle.sh
index dcffd407d..887561b79 100755
--- a/src/minimal_overlay/bundles/java/bundle.sh
+++ b/src/minimal_overlay/bundles/java/bundle.sh
@@ -18,10 +18,7 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
 # Read the 'JAVA_ARCHIVE' property from '.config'
 JAVA_ARCHIVE="$(grep -i ^JAVA_ARCHIVE $MAIN_SRC_DIR/.config | cut -f2 -d'=')"
@@ -34,25 +31,25 @@ elif [ ! -f "$JAVA_ARCHIVE" ] ; then
   exit 1
 fi
 
-rm -rf $MAIN_SRC_DIR/work/overlay/java
-mkdir -p $MAIN_SRC_DIR/work/overlay/java/opt
+rm -rf $WORK_DIR/overlay/java
+mkdir -p $WORK_DIR/overlay/java/opt
 
 tar -xvf \
   $JAVA_ARCHIVE \
-  -C $MAIN_SRC_DIR/work/overlay/java/opt
+  -C $WORK_DIR/overlay/java/opt
 
-cd $MAIN_SRC_DIR/work/overlay/java/opt
+cd $WORK_DIR/overlay/java/opt
 mv $(ls -d *) java
 
-mkdir $MAIN_SRC_DIR/work/overlay/java/bin
+mkdir $WORK_DIR/overlay/java/bin
 
 for FILE in $(ls java/bin)
 do
   ln -s ../opt/java/bin/$FILE ../bin/$FILE
 done
 
-cp -r $MAIN_SRC_DIR/work/overlay/java/* \
-  $MAIN_SRC_DIR/work/src/minimal_overlay/rootfs
+cp -r $WORK_DIR/overlay/java/* \
+  $WORK_DIR/src/minimal_overlay/rootfs
 
 echo "Java has been installed."
 
diff --git a/src/minimal_overlay/bundles/mll_utils/01_prepare.sh b/src/minimal_overlay/bundles/mll_utils/01_prepare.sh
index b8aa8d9c9..36b4db352 100755
--- a/src/minimal_overlay/bundles/mll_utils/01_prepare.sh
+++ b/src/minimal_overlay/bundles/mll_utils/01_prepare.sh
@@ -2,14 +2,11 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
 echo "Preparing the Minimal Linux Live utilities folder. This may take a while..."
-rm -rf $MAIN_SRC_DIR/work/overlay/mll_utils
-mkdir -p $MAIN_SRC_DIR/work/overlay/mll_utils/sbin
+rm -rf $WORK_DIR/overlay/mll_utils
+mkdir -p $WORK_DIR/overlay/mll_utils/sbin
 
 echo "Miminal Linux Live utilities folder has been prepared."
 
diff --git a/src/minimal_overlay/bundles/mll_utils/02_disk_erase.sh b/src/minimal_overlay/bundles/mll_utils/02_disk_erase.sh
index 7c4671f4c..46d854c1a 100755
--- a/src/minimal_overlay/bundles/mll_utils/02_disk_erase.sh
+++ b/src/minimal_overlay/bundles/mll_utils/02_disk_erase.sh
@@ -2,17 +2,14 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
-if [ ! -d "$MAIN_SRC_DIR/work/overlay/mll_utils" ] ; then
-  echo "The directory $MAIN_SRC_DIR/work/overlay/mll_utils does not exist. Cannot continue."
+if [ ! -d "$WORK_DIR/overlay/mll_utils" ] ; then
+  echo "The directory $WORK_DIR/overlay/mll_utils does not exist. Cannot continue."
   exit 1
 fi
 
-cd $MAIN_SRC_DIR/work/overlay/mll_utils
+cd $WORK_DIR/overlay/mll_utils
 
 # 'mll-disk-erase' BEGIN
 
diff --git a/src/minimal_overlay/bundles/mll_utils/03_installer.sh b/src/minimal_overlay/bundles/mll_utils/03_installer.sh
index 1bb460cae..6a5731574 100755
--- a/src/minimal_overlay/bundles/mll_utils/03_installer.sh
+++ b/src/minimal_overlay/bundles/mll_utils/03_installer.sh
@@ -2,17 +2,14 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
-if [ ! -d "$MAIN_SRC_DIR/work/overlay/mll_utils" ] ; then
-  echo "The directory $MAIN_SRC_DIR/work/overlay/mll_utils does not exist. Cannot continue."
+if [ ! -d "$WORK_DIR/overlay/mll_utils" ] ; then
+  echo "The directory $WORK_DIR/overlay/mll_utils does not exist. Cannot continue."
   exit 1
 fi
 
-cd $MAIN_SRC_DIR/work/overlay/mll_utils
+cd $WORK_DIR/overlay/mll_utils
 
 # 'mll-install' BEGIN
 
@@ -102,30 +99,30 @@ chmod +rx sbin/mll-install
 
 # 'mll-install' END
 
-if [ ! -d "$MAIN_SRC_DIR/work/syslinux" ] ; then
+if [ ! -d "$WORK_DIR/syslinux" ] ; then
 echo "The installer depends on Syslinux which is missing. Cannot continue."
   exit 1
 fi;
 
-cd $MAIN_SRC_DIR/work/syslinux
+cd $WORK_DIR/syslinux
 cd $(ls -d syslinux-*)
 
 cp bios/extlinux/extlinux \
-  $MAIN_SRC_DIR/work/overlay/mll_utils/sbin
-mkdir -p $MAIN_SRC_DIR/work/overlay/mll_utils/opt/syslinux 
+  $WORK_DIR/overlay/mll_utils/sbin
+mkdir -p $WORK_DIR/overlay/mll_utils/opt/syslinux 
 cp bios/mbr/mbr.bin \
-  $MAIN_SRC_DIR/work/overlay/mll_utils/opt/syslinux
+  $WORK_DIR/overlay/mll_utils/opt/syslinux
 
 # Big mama hack - need to find proper workaround!!!
 # Both syslinux and extlinux are 32-bit executables which require 32-bit libs.
 # Possible solution 1 - build 32-bit GLIBC on demand.
 # Possible solution 2 - drop 32-bit MLL and provide 64-bit with multi-arch.
-mkdir -p $MAIN_SRC_DIR/work/overlay/mll_utils/lib
-mkdir -p $MAIN_SRC_DIR/work/overlay/mll_utils/usr/lib
+mkdir -p $WORK_DIR/overlay/mll_utils/lib
+mkdir -p $WORK_DIR/overlay/mll_utils/usr/lib
 cp /lib/ld-linux.so.2 \
-  $MAIN_SRC_DIR/work/overlay/mll_utils/lib
+  $WORK_DIR/overlay/mll_utils/lib
 cp /lib/i386-linux-gnu/libc.so.6 \
-  $MAIN_SRC_DIR/work/overlay/mll_utils/usr/lib
+  $WORK_DIR/overlay/mll_utils/usr/lib
 # Big mama hack - end.
 
 echo "Minimal Linux Live installer has been generated."
diff --git a/src/minimal_overlay/bundles/mll_utils/04_install.sh b/src/minimal_overlay/bundles/mll_utils/04_install.sh
index 5610549af..aa4593d30 100755
--- a/src/minimal_overlay/bundles/mll_utils/04_install.sh
+++ b/src/minimal_overlay/bundles/mll_utils/04_install.sh
@@ -2,19 +2,15 @@
 
 SRC_DIR=$(pwd)
 
-# Find the main source directory
-cd ../../..
-MAIN_SRC_DIR=$(pwd)
-cd $SRC_DIR
+. ../../common.sh
 
-if [ ! -d "$MAIN_SRC_DIR/work/overlay/mll_utils" ] ; then
-  echo "The directory $MAIN_SRC_DIR/work/overlay/mll_utils does not exist. Cannot continue."
+if [ ! -d "$WORK_DIR/overlay/mll_utils" ] ; then
+  echo "The directory $WORK_DIR/overlay/mll_utils does not exist. Cannot continue."
   exit 1
 fi
 
 # Copy all generated files to the source overlay folder.
-cp -r $MAIN_SRC_DIR/work/overlay/mll_utils/* \
-  $MAIN_SRC_DIR/work/src/minimal_overlay/rootfs
+cp -r $WORK_DIR/overlay/mll_utils/* $WORK_DIR/src/minimal_overlay/rootfs
 
 echo "All MLL utilities have been installed."