diff --git a/README.md b/README.md
index f0d2463..41c89dc 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Online storage, file sharing platform and various other applications
 
-**Shipped version:** 25.0.1~ynh1
+**Shipped version:** 25.0.3~ynh2
 
 **Demo:** https://demo.nextcloud.com/
 
@@ -29,16 +29,23 @@ Online storage, file sharing platform and various other applications
 
 ## Configuration
 
-#### Configure OnlyOffice integration
+### Configure ONLYOFFICE integration
 
-Starting from Nextcloud 18, it features a direct integration of OnlyOffice (an online rich text document editor) through a Nextcloud app.
+#### With Nextcloud App (no ARM support, lower performance)
+
+Starting from Nextcloud 18, it features a direct integration of ONLYOFFICE (an online rich text document editor) through a Nextcloud app.
 To install and configure it:
-- Install *Community Document Server* application in your Nextcloud. That's the part that runs OnlyOffice server.
-- Install *ONLYOFFICE* application. That's the client part that will connect to an OnlyOffice server.
-- Then in Settings -> ONLYOFFICE (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by OnlyOffice.
+- Install *Community Document Server* application in your Nextcloud. That's the part that runs ONLYOFFICE server.
+- Install *ONLYOFFICE* application. That's the client part that will connect to an ONLYOFFICE server.
+- Then in Settings -> ONLYOFFICE (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by ONLYOFFICE.
 - Here you go :) You should be able to create new type of documents and open them.
 
-*NB: OnlyOffice is only available for x86 architecture - **ARM** architecture is **not** supported (Raspberry Pi, OLinuXino...)*
+*NB: ONLYOFFICE Nextcloud App is only available for x86 architecture - for **ARM** architecture (Raspberry Pi, OLinuXino...), consider the YunoHost App below*
+
+#### With YunoHost App (ARM64 support, better performance)
+
+For better performance and ARM64 support, install ONLYOFFICE YunoHost App and connect it to Nextcloud, see the tutorial in the [doc of onlyoffice_ynh package](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server)
+
 
 ## YunoHost specific features
 
diff --git a/README_fr.md b/README_fr.md
index 4fdadaf..185c8c8 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,7 +17,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Stockage en ligne, plateforme de partage de fichiers et diverses autres applications
 
-**Version incluse :** 25.0.1~ynh1
+**Version incluse :** 25.0.3~ynh2
 
 **Démo :** https://demo.nextcloud.com/
 
@@ -29,16 +29,23 @@ Stockage en ligne, plateforme de partage de fichiers et diverses autres applicat
 
 ## Configuration
 
-#### Configurer l'intégration d'OnlyOffice
+### Configurer l'intégration d'ONLYOFFICE
 
-À partir de sa version 18, Nextcloud inclut une intégration directe de OnlyOffice (un éditeur de texte enrichi en ligne) via une application Nextcloud.
+#### Avec l'application Nextcloud (pas de support ARM, performances limitées)
+
+À partir de sa version 18, Nextcloud inclut une intégration directe de ONLYOFFICE (un éditeur de texte enrichi en ligne) via une application Nextcloud.
 Pour l'installer et la configurer :
-- Installez l'application *Community Document Server* dans votre Nextcloud. C'est la partie qui fait tourner un serveur OnlyOffice.
-- Installez l'application *ONLYOFFICE*. C'est la partie cliente qui va se connecter au serveur OnlyOffice.
-- Ensuite dans les Paramètres -> ONLYOFFICE (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec OnlyOffice.
+- Installez l'application *Community Document Server* dans votre Nextcloud. C'est la partie qui fait tourner un serveur ONLYOFFICE.
+- Installez l'application *ONLYOFFICE*. C'est la partie cliente qui va se connecter au serveur ONLYOFFICE.
+- Ensuite dans les Paramètres -> ONLYOFFICE (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec ONLYOFFICE.
 - Et voilà :) Vous devriez pouvoir créer de nouveaux types de documents, et les ouvrir.
-    
-*NB : OnlyOffice n'est disponible que sous architecture x86 - L'architecture **ARM** n'est **pas** supporté (Raspberry Pi, OLinuXino...)*
+
+*NB : l'app Nextcloud ONLYOFFICE Community Document Server n'est disponible que sous architecture x86 - Pour un support de l'architecture **ARM** (Raspberry Pi, OLinuXino...), installez plutôt l'App YunoHost, voir ci-dessous*
+
+#### Avec l'application YunoHost (support ARM64, meilleures performances)
+
+Pour  de meilleures performances et le support de ARM64, installez l'app YunoHost ONLYOFFICE, voir le tutoriel dans la [doc du paquet onlyoffice_ynh](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server)
+
 
 ## Caractéristiques spécifiques YunoHost
 
diff --git a/check_process b/check_process
index 0776e9c..6922dcc 100644
--- a/check_process
+++ b/check_process
@@ -13,8 +13,8 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		#22.2.9
-		upgrade=1	from_commit=f565b6d216f5340f752e6d6a21a14abc3811e0e7
+		#25.0.2
+		upgrade=1	from_commit=c5cf91ad30149e1924c23b19e93f483c3ed3edd8
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -22,6 +22,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=f565b6d216f5340f752e6d6a21a14abc3811e0e7
-		name=Merge pull request #495 from YunoHost-Apps/22.2.9
+	; commit=c5cf91ad30149e1924c23b19e93f483c3ed3edd8
+		name=Merge pull request #495 from YunoHost-Apps/25.0.2
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1&
diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf
index adfd579..5657e27 100644
--- a/conf/extra_php-fpm.conf
+++ b/conf/extra_php-fpm.conf
@@ -10,7 +10,7 @@ php_value[default_charset] = UTF-8
 ; The following parameters are nevertheless recommended for Nextcloud
 ; see here: https://docs.nextcloud.com/server/15/admin_manual/installation/server_tuning.html#enable-php-opcache
 php_value[opcache.enable_cli]=1
-php_value[opcache.interned_strings_buffer]=8
+php_value[opcache.interned_strings_buffer]=16
 php_value[opcache.max_accelerated_files]=10000
 php_value[opcache.memory_consumption]=128
 php_value[opcache.save_comments]=1
diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
index ff9f640..0a73710 100644
--- a/doc/DISCLAIMER.md
+++ b/doc/DISCLAIMER.md
@@ -1,15 +1,22 @@
 ## Configuration
 
-#### Configure OnlyOffice integration
+### Configure ONLYOFFICE integration
 
-Starting from Nextcloud 18, it features a direct integration of OnlyOffice (an online rich text document editor) through a Nextcloud app.
+#### With Nextcloud App (no ARM support, lower performance)
+
+Starting from Nextcloud 18, it features a direct integration of ONLYOFFICE (an online rich text document editor) through a Nextcloud app.
 To install and configure it:
-- Install *Community Document Server* application in your Nextcloud. That's the part that runs OnlyOffice server.
-- Install *ONLYOFFICE* application. That's the client part that will connect to an OnlyOffice server.
-- Then in Settings -> ONLYOFFICE (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by OnlyOffice.
+- Install *Community Document Server* application in your Nextcloud. That's the part that runs ONLYOFFICE server.
+- Install *ONLYOFFICE* application. That's the client part that will connect to an ONLYOFFICE server.
+- Then in Settings -> ONLYOFFICE (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by ONLYOFFICE.
 - Here you go :) You should be able to create new type of documents and open them.
 
-*NB: OnlyOffice is only available for x86 architecture - **ARM** architecture is **not** supported (Raspberry Pi, OLinuXino...)*
+*NB: ONLYOFFICE Nextcloud App is only available for x86 architecture - for **ARM** architecture (Raspberry Pi, OLinuXino...), consider the YunoHost App below*
+
+#### With YunoHost App (ARM64 support, better performance)
+
+For better performance and ARM64 support, install ONLYOFFICE YunoHost App and connect it to Nextcloud, see the tutorial in the [doc of onlyoffice_ynh package](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server)
+
 
 ## YunoHost specific features
 
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
index aacdc22..343894c 100644
--- a/doc/DISCLAIMER_fr.md
+++ b/doc/DISCLAIMER_fr.md
@@ -1,15 +1,22 @@
 ## Configuration
 
-#### Configurer l'intégration d'OnlyOffice
+### Configurer l'intégration d'ONLYOFFICE
 
-À partir de sa version 18, Nextcloud inclut une intégration directe de OnlyOffice (un éditeur de texte enrichi en ligne) via une application Nextcloud.
+#### Avec l'application Nextcloud (pas de support ARM, performances limitées)
+
+À partir de sa version 18, Nextcloud inclut une intégration directe de ONLYOFFICE (un éditeur de texte enrichi en ligne) via une application Nextcloud.
 Pour l'installer et la configurer :
-- Installez l'application *Community Document Server* dans votre Nextcloud. C'est la partie qui fait tourner un serveur OnlyOffice.
-- Installez l'application *ONLYOFFICE*. C'est la partie cliente qui va se connecter au serveur OnlyOffice.
-- Ensuite dans les Paramètres -> ONLYOFFICE (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec OnlyOffice.
+- Installez l'application *Community Document Server* dans votre Nextcloud. C'est la partie qui fait tourner un serveur ONLYOFFICE.
+- Installez l'application *ONLYOFFICE*. C'est la partie cliente qui va se connecter au serveur ONLYOFFICE.
+- Ensuite dans les Paramètres -> ONLYOFFICE (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec ONLYOFFICE.
 - Et voilà :) Vous devriez pouvoir créer de nouveaux types de documents, et les ouvrir.
-    
-*NB : OnlyOffice n'est disponible que sous architecture x86 - L'architecture **ARM** n'est **pas** supporté (Raspberry Pi, OLinuXino...)*
+
+*NB : l'app Nextcloud ONLYOFFICE Community Document Server n'est disponible que sous architecture x86 - Pour un support de l'architecture **ARM** (Raspberry Pi, OLinuXino...), installez plutôt l'App YunoHost, voir ci-dessous*
+
+#### Avec l'application YunoHost (support ARM64, meilleures performances)
+
+Pour  de meilleures performances et le support de ARM64, installez l'app YunoHost ONLYOFFICE, voir le tutoriel dans la [doc du paquet onlyoffice_ynh](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server)
+
 
 ## Caractéristiques spécifiques YunoHost
 
diff --git a/doc/screenshots/screenshot.png b/doc/screenshots/screenshot.png
index 966bb3e..1cce4ec 100644
Binary files a/doc/screenshots/screenshot.png and b/doc/screenshots/screenshot.png differ
diff --git a/scripts/upgrade b/scripts/upgrade
index b94c456..d7b8c9e 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -148,10 +148,13 @@ ynh_add_nginx_config
 
 # Define a function to execute commands with `occ`
 exec_occ() {
-    # Backward compatibility to upgrade from NC14 or older version
-    if [ $current_major_version = "last" ] || [ $current_major_version -ge 15 ]
+    # Backward compatibility to upgrade from older versions
+    if [ $current_major_version = "last" ] || [ $current_major_version -ge 24 ]
     then
         NEXTCLOUD_PHP_VERSION=$phpversion
+    elif [ $current_major_version -ge 15 ]
+    then
+        NEXTCLOUD_PHP_VERSION="7.4"
     else
         NEXTCLOUD_PHP_VERSION="7.0"
     fi
diff --git a/scripts/upgrade.d/upgrade.21.sh b/scripts/upgrade.d/upgrade.21.sh
index f617405..1be1435 100644
--- a/scripts/upgrade.d/upgrade.21.sh
+++ b/scripts/upgrade.d/upgrade.21.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Last available nextcloud version
-next_version="22.0.0"
+next_version="22.2.10"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="3911d3754c37aca7c9b5f3b2b37513c0f2b5bb979af00816c1117b1eedbc5d7a"
+nextcloud_source_sha256="8de167bfcfcaa661245a00a5ac36628e7961951b9fe2dfaf4f8a5aac6907ccdb"
diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh
index 4b026f4..bb058bb 100644
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Last available Nextcloud version
-next_version="25.0.1"
+next_version="25.0.3"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="72d4076924caf19139c40178597af6211799e20440ce196fb43b9c4e47d77515"
+nextcloud_source_sha256="4b2b1423736ef92469096fe24f61c24cad87a34e07c1c7a81b385d3ea25c00ec"