diff --git a/my-distro-debian-32-pae/BldHelper.sh b/my-distro-debian-32-pae/BldHelper.sh
index c01b0461..f308d5ae 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-configs/my-distro-debian-32-pae
+WorkingDir=/home/$SUDO_USER/My-distro-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 efc19831..d10648da 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-configs/my-distro-debian-32
+WorkingDir=/home/$SUDO_USER/My-distro-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 ba9edc65..9d7c504b 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-configs/my-distro-debian-64
+WorkingDir=/home/$SUDO_USER/My-distro-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 f0018053..adc64f26 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-configs/my-distro-devuan-32-pae
+WorkingDir=/home/$SUDO_USER/My-distro-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 c47bd10a..24d22c50 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-configs/my-distro-devuan-32
+WorkingDir=/home/$SUDO_USER/My-distro-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 d2cbd34e..e468bddd 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-configs/my-distro-devuan-64
+WorkingDir=/home/$SUDO_USER/My-distro-configs/my-distro-devuan-64
 
 # Execute the ISO building script
 cd ${WorkingDir}
diff --git a/my-distro-ubuntu-64/BldHelper.sh b/my-distro-ubuntu-64/BldHelper.sh
index dcaa7577..a37dd7a1 100755
--- a/my-distro-ubuntu-64/BldHelper.sh
+++ b/my-distro-ubuntu-64/BldHelper.sh
@@ -15,7 +15,7 @@ BUILD=ubuntu-64
 FileName="${PREFIX}-${SUFFIX}"
 LOCATION=$HOME/out/${BUILD}
 LogDir=$HOME/logs
-WorkingDir=$HOME/My-distro-configs/my-distro-ubuntu-64
+WorkingDir=/home/$SUDO_USER/My-distro-configs/my-distro-ubuntu-64
 
 # Execute the ISO building script
 cd ${WorkingDir}