diff --git a/my-distro-debian-32-pae/BldHelper.sh b/my-distro-debian-32-pae/BldHelper.sh
index 08cbd149..79cf0c35 100755
--- a/my-distro-debian-32-pae/BldHelper.sh
+++ b/my-distro-debian-32-pae/BldHelper.sh
@@ -15,7 +15,7 @@ BUILD=deb-32-pae
 FileName="${PREFIX}-${SUFFIX}"
 LOCATION=$HOME/out/${BUILD}
 LogDir=$HOME/logs
-WorkingDir=$HOME/My-distro-DI-configs/my-distro-debian-32-pae
+WorkingDir=/home/$SUDO_USER/My-distro-DI-configs/my-distro-debian-32-pae
 
 # Execute the ISO building script
 cd ${WorkingDir}
diff --git a/my-distro-debian-32/BldHelper.sh b/my-distro-debian-32/BldHelper.sh
index d17f5ada..3b2896b3 100755
--- a/my-distro-debian-32/BldHelper.sh
+++ b/my-distro-debian-32/BldHelper.sh
@@ -15,7 +15,7 @@ BUILD=deb-32
 FileName="${PREFIX}-${SUFFIX}"
 LOCATION=$HOME/out/${BUILD}
 LogDir=$HOME/logs
-WorkingDir=$HOME/My-distro-DI-configs/my-distro-debian-32
+WorkingDir=/home/$SUDO_USER/My-distro-DI-configs/my-distro-debian-32
 
 # Execute the ISO building script
 cd ${WorkingDir}
diff --git a/my-distro-debian-64/BldHelper.sh b/my-distro-debian-64/BldHelper.sh
index 3e3e5cd9..24b9d09b 100755
--- a/my-distro-debian-64/BldHelper.sh
+++ b/my-distro-debian-64/BldHelper.sh
@@ -15,7 +15,7 @@ BUILD=deb-64
 FileName="${PREFIX}-${SUFFIX}"
 LOCATION=$HOME/out/${BUILD}
 LogDir=$HOME/logs
-WorkingDir=$HOME/My-distro-DI-configs/my-distro-debian-64
+WorkingDir=/home/$SUDO_USER/My-distro-DI-configs/my-distro-debian-64
 
 # Execute the ISO building script
 cd ${WorkingDir}
diff --git a/my-distro-devuan-32-pae/BldHelper.sh b/my-distro-devuan-32-pae/BldHelper.sh
index f962e3a5..75cbefed 100755
--- a/my-distro-devuan-32-pae/BldHelper.sh
+++ b/my-distro-devuan-32-pae/BldHelper.sh
@@ -15,7 +15,7 @@ BUILD=dev-32-pae
 FileName="${PREFIX}-${SUFFIX}"
 LOCATION=$HOME/out/${BUILD}
 LogDir=$HOME/logs
-WorkingDir=$HOME/My-distro-DI-configs/my-distro-devuan-32-pae
+WorkingDir=/home/$SUDO_USER/My-distro-DI-configs/my-distro-devuan-32-pae
 
 # Execute the ISO building script
 cd ${WorkingDir}
diff --git a/my-distro-devuan-32/BldHelper.sh b/my-distro-devuan-32/BldHelper.sh
index 85f0c48c..e7fb8511 100755
--- a/my-distro-devuan-32/BldHelper.sh
+++ b/my-distro-devuan-32/BldHelper.sh
@@ -15,7 +15,7 @@ BUILD=dev-32
 FileName="${PREFIX}-${SUFFIX}"
 LOCATION=$HOME/out/${BUILD}
 LogDir=$HOME/logs
-WorkingDir=$HOME/My-distro-DI-configs/my-distro-devuan-32
+WorkingDir=/home/$SUDO_USER/My-distro-DI-configs/my-distro-devuan-32
 
 # Execute the ISO building script
 cd ${WorkingDir}
diff --git a/my-distro-devuan-64/BldHelper.sh b/my-distro-devuan-64/BldHelper.sh
index 225df201..00a6c43e 100755
--- a/my-distro-devuan-64/BldHelper.sh
+++ b/my-distro-devuan-64/BldHelper.sh
@@ -15,7 +15,7 @@ BUILD=dev-64
 FileName="${PREFIX}-${SUFFIX}"
 LOCATION=$HOME/out/${BUILD}
 LogDir=$HOME/logs
-WorkingDir=$HOME/My-distro-DI-configs/my-distro-devuan-64
+WorkingDir=/home/$SUDO_USER/My-distro-DI-configs/my-distro-devuan-64
 
 # Execute the ISO building script
 cd ${WorkingDir}