diff --git a/scripts/install b/scripts/install
index d7cedf3..3891380 100755
--- a/scripts/install
+++ b/scripts/install
@@ -21,7 +21,7 @@ email=$(ynh_user_get_info --username=$admin --key="mail")
 ynh_script_progression --message="Setting up source files..." --weight=1
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir"
+ynh_setup_source --dest_dir="$install_dir/source"
 
 mkdir -p "$install_dir/accounts/newsmirror"
 
@@ -37,7 +37,9 @@ chown -R "$app:www-data" "$install_dir"
 ynh_script_progression --message="Creating admin user" --weight=1
 
 # Create admin
-ynh_exec_as "$app" python3 "$install_dir/epicyon.py" --addaccount="$admin" --password=$password --domain=$domain
+pushd "$install_dir"
+    ynh_exec_as "$app" python3 "$install_dir/epicyon.py" --addaccount="$admin" --password="$password" --domain="$domain"
+popd
 
 #=================================================
 # SYSTEM CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index b0c957f..e6eabc7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -24,7 +24,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app
 ynh_script_progression --message="Upgrading source files..." --weight=1
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir"
+ynh_setup_source --dest_dir="$install_dir/source" --full_replace=1
 
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"