diff --git a/scripts/install b/scripts/install
index 7abbb2a..56b92ff 100755
--- a/scripts/install
+++ b/scripts/install
@@ -27,7 +27,6 @@ is_public=$YNH_APP_ARG_IS_PUBLIC
 password=$YNH_APP_ARG_PASSWORD
 group_name=$YNH_APP_ARG_GROUP_NAME
 group_description=$YNH_APP_ARG_GROUP_DESCRIPTION
-architecture=$YNH_ARCH
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -92,7 +91,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 
 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="$final_path" --source_id=$YNH_ARCH
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
diff --git a/scripts/upgrade b/scripts/upgrade
index 9a038b5..25994c6 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -24,7 +24,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 group_name=$(ynh_app_setting_get --app=$app --key=group_name)
 port=$(ynh_app_setting_get --app=$app --key=port)
 turn_port=$(ynh_app_setting_get --app=$app --key=turn_port)
-architecture=$YNH_ARCH
 
 if ynh_compare_current_package_version --comparison le --version 0.3.5~ynh3
 then
@@ -103,7 +102,7 @@ then
 	# Remove the app directory securely
 	ynh_secure_remove --file=$final_path
 
-	ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" #--keep="$final_path/data/config.json"
+	ynh_setup_source --dest_dir="$final_path" --source_id=$YNH_ARCH #--keep="$final_path/data/config.json"
 fi
 
 chmod 750 "$final_path"