diff --git a/scripts/install b/scripts/install
index e0705af..65739c5 100755
--- a/scripts/install
+++ b/scripts/install
@@ -28,7 +28,6 @@ path_url="/"
 is_public=$YNH_APP_ARG_IS_PUBLIC
 admin=$YNH_APP_ARG_ADMIN
 password=$YNH_APP_ARG_PASSWORD
-architecture=$YNH_ARCH
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -86,8 +85,8 @@ ynh_script_progression --message="Setting up source files..." --weight=10
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path" --source_id="$architecture"
-ynh_setup_source --dest_dir="$mc_path" --source_id="mc_$architecture"
+ynh_setup_source --dest_dir="$final_path" --source_id="$YNH_ARCH"
+ynh_setup_source --dest_dir="$mc_path" --source_id="mc_$YNH_ARCH"
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
diff --git a/scripts/upgrade b/scripts/upgrade
index e54c3c6..a620f00 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -26,7 +26,6 @@ password=$(ynh_app_setting_get --app=$app --key=password)
 port=$(ynh_app_setting_get --app=$app --key=port)
 console_port=$(ynh_app_setting_get --app=$app --key=console_port)
 datadir=$(ynh_app_setting_get --app=$app --key=datadir)
-architecture=$YNH_ARCH
 
 #=================================================
 # CHECK VERSION
@@ -81,8 +80,8 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" --keep="$final_path/.env"
-	ynh_setup_source --dest_dir="$mc_path" --source_id="mc_$architecture"
+	ynh_setup_source --dest_dir="$final_path" --source_id="$YNH_ARCH" --keep=".env"
+	ynh_setup_source --dest_dir="$mc_path" --source_id="mc_$YNH_ARCH"
 fi
 
 chmod 750 "$final_path"