diff --git a/scripts/install b/scripts/install
index 8b46920..f49356c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -25,7 +25,6 @@ path_url="/"
 is_public=$YNH_APP_ARG_IS_PUBLIC
 timezone="$(cat /etc/timezone)"
 secret=$(ynh_string_random --length=32)
-architecture=$YNH_ARCH
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -112,7 +111,7 @@ ynh_script_progression --message="Setting up backend..." --weight=1
 mkdir -p "/opt/vikunja"
 mkdir -p "/opt/vikunja/files"
 tempdir="$(mktemp -d)"
-ynh_setup_source --dest_dir=$tempdir --source_id="$architecture"
+ynh_setup_source --dest_dir=$tempdir --source_id=$YNH_ARCH
 back="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")"
 cp "$back" "/opt/vikunja/vikunja"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 8ad7751..abba826 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -25,7 +25,6 @@ db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 timezone="$(cat /etc/timezone)"
 secret=$(ynh_string_random --length=32)
-architecture=$YNH_ARCH
 
 set_motd=$(ynh_app_setting_get --app=$app --key=set_motd)
 enable_registration=$(ynh_app_setting_get --app=$app --key=enable_registration)
@@ -109,7 +108,7 @@ then
 	# Backend
 	mkdir -p "/opt/vikunja/files"
 	tempdir="$(mktemp -d)"
-	ynh_setup_source --dest_dir=$tempdir --source_id="$architecture"
+	ynh_setup_source --dest_dir=$tempdir --source_id=$YNH_ARCH
 	back="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")"
 	cp "$back" "/opt/vikunja/vikunja"
 fi