diff --git a/bin/buildiso.in b/bin/buildiso.in
old mode 100755
new mode 100644
diff --git a/bin/testiso.in b/bin/testiso.in
old mode 100755
new mode 100644
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 8ff5b45e5e45fa0779ddcb6a1fd5bef2f05d44b8..08c745d9ff0efa460d17abc0ce43484268a5505f 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -583,7 +583,7 @@ load_profile(){
     mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}" -K)
     work_dir=${chroots_iso}/${profile}/${target_arch}
 
-    iso_dir="${cache_dir_iso}/${edition}/${dist_release}/${profile}"
+    iso_dir="${cache_dir_iso}/${edition}/${profile}/${dist_release}"
 
     iso_root=${chroots_iso}/${profile}/iso
     mnt_dir=${chroots_iso}/${profile}/mnt
diff --git a/lib/util-publish.sh b/lib/util-publish.sh
index 13b841df5192ce2e4dfd1404617c5f2eb295034a..721c30d8b8cec8b3522764be8cd30772cb359c2b 100644
--- a/lib/util-publish.sh
+++ b/lib/util-publish.sh
@@ -10,17 +10,16 @@
 # GNU General Public License for more details.
 
 create_release(){
-    msg "Create release (%s) ..." "${dist_release}"
-    rsync ${rsync_args[*]} /dev/null ${url}/${dist_release}/
+    msg "Create release (%s) ..." "$1/${dist_release}"
+    rsync ${rsync_args[*]} /dev/null ${url}/$1/${dist_release}/
     show_elapsed_time "${FUNCNAME}" "${timer_start}"
-    msg "Done (%s)" "${dist_release}"
+    msg "Done (%s)" "$1/${dist_release}"
 }
 
 get_edition(){
-    local result=$(find ${run_dir} -maxdepth 3 -name "$1") path
+    local result=$(find ${run_dir} -maxdepth 2 -name "$1") path
     [[ -z $result ]] && die "%s is not a valid profile or build list!" "$1"
     path=${result%/*}
-    path=${path%/*}
     echo ${path##*/}
 }
 
@@ -33,17 +32,17 @@ prepare_transfer(){
     local edition=$(get_edition $1)
     project=$(get_project "${edition}")
     url=$(connect "${project}")
-    target_dir="${dist_release}/$1"
+    target_dir="$1/${dist_release}"
     src_dir="${run_dir}/${edition}/${target_dir}"
 }
 
 sync_dir(){
     prepare_transfer "$1"
     if ${release} && ! ${exists};then
-        create_release
+        create_release "$1"
         exists=true
     fi
-    msg "Start upload [%s] ..." "$1"
+    msg "Start upload [%s] --> [${project}] ..." "$1"
     rsync ${rsync_args[*]} ${src_dir}/ ${url}/${target_dir}/
     msg "Done upload [%s]" "$1"
     show_elapsed_time "${FUNCNAME}" "${timer_start}"
diff --git a/lib/util.sh b/lib/util.sh
index cef13f4cc92ce7fef5e4904747056bc9344daaff..065accb0685487d0fb92007c7a4ac991c853d289 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -136,8 +136,8 @@ show_elapsed_time(){
 get_project(){
     local project
     case "$1" in
-        'community') project='manjarolinux-community' ;;
-        'manjaro') project='manjarolinux' ;;
+        'community') [[ "${dist_release}" =~ [a-z] ]] && project='manjarotest-community' || project='manjarolinux-community' ;;
+        'manjaro') [[ "${dist_release}" =~ [a-z] ]] && project='manjarotest' || project='manjarolinux' ;;
         'sonar') project='sonargnulinux' ;;
     esac
     echo ${project}