diff --git a/conf/amd64.src b/conf/amd64.src
new file mode 100644
index 0000000..cd345af
--- /dev/null
+++ b/conf/amd64.src
@@ -0,0 +1,7 @@
+SOURCE_URL=https://github.com/kiwiirc/kiwiirc/releases/download/v1.6.1/kiwiirc-server_v1.6.1-1_linux_amd64.deb
+SOURCE_SUM=de6bb7363523ebfaa61c853c6a64e73c5a3b0df204c757aaaaf3ca79ba7e12d1
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=deb
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=kiwiirc.deb
+SOURCE_EXTRACT=false
diff --git a/conf/app.src b/conf/app.src
deleted file mode 100644
index 768a4e4..0000000
--- a/conf/app.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://kiwiirc.com/downloads/kiwiirc_20.05.24.1-1_amd64.deb
-SOURCE_SUM=c99504c6de678fd91aed357ff0dada16a8df9e932970ed85767b516a9f87df52
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=deb
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=kiwiirc.deb
-SOURCE_EXTRACT=false
diff --git a/conf/arm64.src b/conf/arm64.src
new file mode 100644
index 0000000..68b259a
--- /dev/null
+++ b/conf/arm64.src
@@ -0,0 +1,7 @@
+SOURCE_URL=https://github.com/kiwiirc/kiwiirc/releases/download/v1.6.1/kiwiirc-server_v1.6.1-1_linux_arm64.deb
+SOURCE_SUM=4a2ffd2dc53404a0f875333af10c6c24514532e0ffee95104551d8d3f4e2b2b0
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=deb
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=kiwiirc.deb
+SOURCE_EXTRACT=false
diff --git a/conf/armhf.src b/conf/armhf.src
new file mode 100644
index 0000000..923dd44
--- /dev/null
+++ b/conf/armhf.src
@@ -0,0 +1,7 @@
+SOURCE_URL=https://github.com/kiwiirc/kiwiirc/releases/download/v1.6.1/kiwiirc-server_v1.6.1-1_linux_armhf.deb
+SOURCE_SUM=94b8e670e10c481dba46aadbdbfd7e9d92ce9c08dbe113e171327e5ba1b8791a
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=deb
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=kiwiirc.deb
+SOURCE_EXTRACT=false
diff --git a/manifest.json b/manifest.json
index 2a285be..47a921f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Versatile web based messenger using IRC",
         "fr": "Messagerie Web polyvalente utilisant IRC"
     },
-    "version": "20.05.24.1~ynh1",
+    "version": "1.6.1~ynh1",
     "url": "https://github.com/kiwiirc/kiwiirc",
     "upstream": {
         "license": "AGPL-3.0-only",
diff --git a/scripts/install b/scripts/install
index 489f595..0235b50 100644
--- a/scripts/install
+++ b/scripts/install
@@ -22,6 +22,7 @@ ynh_abort_if_errors
 
 domain=$YNH_APP_ARG_DOMAIN
 path_url="/"
+architecture=$YNH_ARCH
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -56,7 +57,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 ynh_script_progression --message="Setting up source files..." --weight=2
 
 tempdir="$(mktemp -d)"
-ynh_setup_source --dest_dir=$tempdir --source_id=app
+ynh_setup_source --dest_dir=$tempdir --source_id="$architecture"
 ynh_exec_warn_less dpkg -i $tempdir/kiwiirc.deb
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index da0df06..ffc7063 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -19,6 +19,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 port=$(ynh_app_setting_get --app=$app --key=port)
+architecture=$YNH_ARCH
 
 #=================================================
 # CHECK VERSION
@@ -47,7 +48,7 @@ ynh_abort_if_errors
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	tempdir="$(mktemp -d)"
-	ynh_setup_source --dest_dir=$tempdir --source_id=app
+	ynh_setup_source --dest_dir=$tempdir --source_id="$architecture"
 	ynh_exec_warn_less dpkg -i $tempdir/kiwiirc.deb
 fi