diff --git a/conf/arm-7.src b/conf/arm-7.src
index 5f00e53..c70abf2 100644
--- a/conf/arm-7.src
+++ b/conf/arm-7.src
@@ -1,5 +1,5 @@
 SOURCE_URL=https://github.com/gotify/server/releases/download/v2.0.16/gotify-linux-arm-7.zip
-SOURCE_SUM=c0919fa83fadf6ffee12b14dd94c0662bff69e83c11f51f9f1228ac374f91bf0
+SOURCE_SUM=62cd54303a79af678a77b8591836851c31cebf83c48392fd149007ba39926691
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
diff --git a/conf/arm.src b/conf/arm.src
deleted file mode 100644
index c70abf2..0000000
--- a/conf/arm.src
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCE_URL=https://github.com/gotify/server/releases/download/v2.0.16/gotify-linux-arm-7.zip
-SOURCE_SUM=62cd54303a79af678a77b8591836851c31cebf83c48392fd149007ba39926691
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=zip
-SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotify-linux-arm-7
diff --git a/conf/systemd.service b/conf/systemd.service
index 8151764..7d424a4 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -8,7 +8,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__FINALPATH__/
-ExecStart=__FINALPATH__/gotify-linux-amd64
+ExecStart=__FINALPATH__/gotify-linux-__ARCHITECTURE__
 
 [Install]
 WantedBy=multi-user.target
diff --git a/scripts/install b/scripts/install
index 0735709..b45f828 100755
--- a/scripts/install
+++ b/scripts/install
@@ -107,6 +107,7 @@ ynh_system_user_create $app
 #=================================================
 
 # Create a dedicated systemd config
+ynh_replace_string "__ARCHITECTURE__" $architecture "../conf/systemd.service"
 ynh_add_systemd_config
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 67c663e..e517fb7 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -129,6 +129,7 @@ ynh_store_file_checksum "$final_path/config.yml"
 #=================================================
 
 # Create a dedicated systemd config
+ynh_replace_string "__ARCHITECTURE__" $architecture "../conf/systemd.service"
 ynh_add_systemd_config
 
 #=================================================