diff --git a/auto_build.sh b/auto_build.sh
old mode 100644
new mode 100755
index 20c66ae..e74ffe0
--- a/auto_build.sh
+++ b/auto_build.sh
@@ -7,7 +7,7 @@ repo_url="http://repo.yunohost.org/debian/"
 
 build_yunohost_org_dir="/var/www/build"
 
-iso_directory="$script_dir"
+iso_directory="/var/www/build"
 old_iso_directory="$iso_directory/releases_archive"
 mkdir -p "$old_iso_directory"
 
@@ -21,10 +21,10 @@ get_ynh_release () {
 
 build_new_version () {
 	local arch="$1"
-	echo -e "\n$(date)" >> "$script_dir/ynh_build.log"
-	echo ">>> Build a new iso for YunoHost $dist on $deb_dist $arch" | tee -a "$script_dir/ynh_build.log"
+	echo -e "\n$(date)" >> "/var/log/build_yunohost/ynh_build.log"
+	echo ">>> Build a new iso for YunoHost $dist on $deb_dist $arch" | tee -a "/var/log/build_yunohost/ynh_build.log"
 	(cd "$script_dir"
-	./build-yunohost $arch $dist $deb_dist 2>&1 | tee -a "$script_dir/ynh_build.log"
+	./build-yunohost $arch $dist $deb_dist 2>&1 | tee -a "/var/log/build_yunohost/ynh_build.log"
 	)
 
 	# Move the old iso in another directory
diff --git a/build-yunohost b/build-yunohost
index af8dffd..8053bd8 100755
--- a/build-yunohost
+++ b/build-yunohost
@@ -30,7 +30,7 @@ function build
     fi
 
     # Build a simple/regular debian CD image ?
-    build-simple-cdd --dist $DEB_DIST --conf ./simple-cdd-$ARCH.conf
+    sudo -u yunohost build-simple-cdd --dist $DEB_DIST --conf ./simple-cdd-$ARCH.conf
 
     # Find the release version of debian
     local DEBNUM="$(grep "Version:" tmp/${DEB_DIST}_Release | awk '{print $2;}')"
@@ -77,15 +77,15 @@ function sign
     # Remove previous signature to prevent gpg to ask about overwriting
     rm -f $NAME.sig
 
-    gpg --output $NAME.sig --detach-sig $NAME
-
+    sudo gpg --output $NAME.sig --detach-sig $NAME
+    
     sha256sum $NAME > $NAME.sum
 }
 
 function build_and_sign
 {
     local ARCH="$1"
-    
+
     rm -rf $(pwd)/tmp
     rm -rf $(pwd)/images/debian*
     
@@ -95,6 +95,7 @@ function build_and_sign
 
 function main
 {
+    
     if [ -z "$ARCH_CHOICE" ]
     then
         info "No arch chosen, will build both i396 and amd64"