diff --git a/bin/deployiso.in b/bin/deployiso.in
index f73a9ac..581e04c 100644
--- a/bin/deployiso.in
+++ b/bin/deployiso.in
@@ -21,12 +21,12 @@ import ${LIBDIR}/util-publish.sh
 
 show_profile(){
 	eval_edition "$1"
-	cd ${edition_type}/$1
+	cd ${cache_dir_iso}/${edition_type}/$1
 		msg3 "Iso: [$1]"
 		prepare_transfer "$1"
 		msg2 "src_dir: ${src_dir}"
 		msg2 "remote_dir: ${remote_dir}"
-	cd ../..
+	cd ${cache_dir_iso}
 }
 
 display_settings(){
@@ -67,6 +67,8 @@ load_user_info
 load_config "${USER_CONFIG}/manjaro-tools.conf"
 load_config "${SYSCONFDIR}/manjaro-tools.conf"
 
+run_dir=${cache_dir_iso}
+
 pretend=false
 remote_create=false
 update=false
diff --git a/lib/util-publish.sh b/lib/util-publish.sh
index ba4f734..dd0d7d0 100644
--- a/lib/util-publish.sh
+++ b/lib/util-publish.sh
@@ -30,12 +30,12 @@ prepare_transfer(){
 
 sync_dir(){
 	eval_edition "$1"
-	cd ${edition_type}/$1
+	cd ${cache_dir_iso}/${edition_type}/$1
 		prepare_transfer "$1"
 		${remote_create} && create_subtree "$1"
-		msg "Start upload [$1] ..."
+		msg "Start upload [$1] (${arch}) ..."
 		rsync ${rsync_args[*]} ${src_dir}/ ${sf_url}/${remote_dir}/
 		msg "Done upload [$1]"
 		msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer_start}) minutes"
-	cd ../..
+	cd ${cache_dir_iso}
 }