diff --git a/scripts/_common.sh b/scripts/_common.sh
index eef890b..62b6d95 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,9 +6,14 @@
 
 # dependencies used by the app
 pkg_dependencies="openjdk-8-jre-headless|openjdk-11-jre-headless debconf|debconf-2.0 procps uuid-runtime lua-ldap"
-pkg_dependencies_arm="automake autoconf build-essential libtool git maven m4"
-pkg_extra_dependencies_arm="openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdf openjdk-8-jdk-headless"
 
+if [ $YNH_ARCH == "armhf" ] 
+then
+	pkg_dependencies_arm="openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdf openjdk-8-jdk-headless \
+                          automake autoconf build-essential libtool git maven m4"
+    
+    pkg_dependencies="$pkg_dependencies $pkg_dependencies_arm"
+fi
 #=================================================
 # PERSONAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index c3055fc..2667b0e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -98,7 +98,6 @@ ynh_app_setting_set --app=$app --key=port_component --value=$port_component
 #=================================================
 ynh_script_progression --message="Installing dependencies..."
 
-# install generic dependencies
 ynh_install_app_dependencies $pkg_dependencies
 
 if ! yunohost app list | grep -q "prosody"
diff --git a/scripts/restore b/scripts/restore
index ac23e2c..702caea 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -89,15 +89,6 @@ ynh_script_progression --message="Reinstalling dependencies..."
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies
 
-if [ $YNH_ARCH == "armhf" ] 
-then
-	# install arm specific depedencies to compile extra dependencies
-	ynh_install_app_dependencies $pkg_dependencies_arm
-	
-	# install extra dependencies not present in default debian repositories
-	ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm"
-fi
-
 if ! yunohost app list | grep -q "prosody"
 then
 	yunohost tools update
diff --git a/scripts/upgrade b/scripts/upgrade
index 019c1b0..8f7bbff 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,7 +82,7 @@ fi
 
 # If max_memory doesn't exist, create it and set to default 75 mb value
 if [ -z "$max_memory" ]; then
-	max_memory=75
+	max_memory=200
 	ynh_app_setting_set --app=$app --key=max_memory --value=$max_memory
 fi
 
@@ -145,15 +145,6 @@ ynh_script_progression --message="Upgrading dependencies..."
 
 ynh_install_app_dependencies $pkg_dependencies
 
-if [ $YNH_ARCH == "armhf" ] 
-then
-	# install arm specific depedencies to compile extra dependencies
-	ynh_install_app_dependencies $pkg_dependencies_arm
-	
-	# install extra dependencies not present in default debian repositories
-	ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm"
-fi
-
 if ! yunohost app list | grep -q "prosody"
 then
 	yunohost tools update