diff --git a/my-distro-devuan-32-pae/BldHelper.sh b/my-distro-devuan-32-pae/BldHelper.sh
index 49f80453..82cb9f4b 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-devuan/my-distro-devuan-32-pae
+WorkingDir=/home/$SUDO_USER/My-distro-configs-devuan/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 1b30f938..046945d6 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-devuan/my-distro-devuan-32
+WorkingDir=/home/$SUDO_USER/My-distro-configs-devuan/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 83d4886f..6fcb210e 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-devuan/my-distro-devuan-64
+WorkingDir=/home/$SUDO_USER/My-distro-configs-devuan/my-distro-devuan-64
 
 # Execute the ISO building script
 cd ${WorkingDir}