diff --git a/scripts/install b/scripts/install
index ab23ed6..cf8b782 100644
--- a/scripts/install
+++ b/scripts/install
@@ -20,8 +20,6 @@ ynh_abort_if_errors
 #=================================================
 
 # Retrieve arguments
-architecture=$YNH_ARCH
-
 app=$YNH_APP_INSTANCE_NAME
 
 #=================================================
@@ -47,7 +45,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 4f4caae..69e1494 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -17,7 +17,6 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 app=$YNH_APP_INSTANCE_NAME
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-architecture=$YNH_ARCH
 
 #=================================================
 # CHECK VERSION
@@ -74,7 +73,7 @@ then
 	#ynh_secure_remove --file="$final_path"
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" --keep="$final_path/matterbridge.toml"
+	ynh_setup_source --dest_dir="$final_path" --source_id=$YNH_ARCH --keep="$final_path/matterbridge.toml"
 
 	# Copy the admin saved settings from tmp directory to final path	
 	#cp -a "$tmpdir/matterbridge.toml" "$final_path/matterbridge.toml"