diff --git a/conf/nginx.conf b/conf/nginx.conf
index b22bd43..cfdefca 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -14,7 +14,7 @@ location __PATH__/ {
   try_files $uri $uri/ index.php;
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
+    fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
 
     fastcgi_index index.php;
     include fastcgi_params;
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index ab5dca9..ab1a471 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -33,7 +33,7 @@ group = __USER__
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /var/run/php/php7.0-fpm-__NAMETOCHANGE__.sock
+listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
diff --git a/manifest.json b/manifest.json
index 6930409..c4900b3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -19,7 +19,7 @@
   "multi_instance": true,
   "services": [
       "nginx",
-      "php5-fpm",
+      "php7.0-fpm",
       "mysql"
   ],
   "arguments": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 487bb6e..7a7c121 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,9 @@
 # COMMON VARIABLES
 #=================================================
 
-pkg_dependencies="php-cli php-mbstring php-xml"
+YNH_PHP_VERSION="7.3"
+
+extra_php_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml"
 
 #=================================================
 # EXPERIMENTAL HELPERS
diff --git a/scripts/backup b/scripts/backup
index 436d89d..e884e5d 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -46,7 +46,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
 
-ynh_backup --src_path="/etc/php/7.0/fpm/pool.d/$app.conf"
+ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================
 # BACKUP SYSTEMD
diff --git a/scripts/change_url b/scripts/change_url
index c6c991e..f3f840e 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -49,7 +49,7 @@ fi
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating nginx web server configuration..." --weight=2
+ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2
 
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
@@ -87,7 +87,7 @@ ynh_replace_string --match_string="define('SELF_URL_PATH'.*" --replace_string="d
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."  --weight=2
+ynh_script_progression --message="Reloading NGINX web server..."  --weight=2
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/install b/scripts/install
index df1b519..398776d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -49,13 +49,6 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url
 
 #=================================================
 # STANDARD MODIFICATIONS
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=9
-
-ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # CREATE A MYSQL DATABASE
 #=================================================
@@ -77,9 +70,9 @@ ynh_setup_source --dest_dir="$final_path"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring nginx web server..." --weight=2
+ynh_script_progression --message="Configuring NGINX web server..." --weight=2
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
@@ -93,10 +86,10 @@ ynh_system_user_create --username=$app
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring php-fpm..." --weight=2
+ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
-# Create a dedicated php-fpm config
-ynh_add_fpm_config
+# Create a dedicated PHP-FPM config
+ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC SETUP
@@ -165,7 +158,7 @@ ynh_app_setting_set --app=$app --key=skipped_uris --value="/public.php,/api,/opm
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..." --weight=2
+ynh_script_progression --message="Reloading NGINX web server..." --weight=2
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/remove b/scripts/remove
index b9417f8..9aec8c8 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -68,9 +68,9 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing nginx web server configuration..." --weight=1
+ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
 
-# Remove the dedicated nginx config
+# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index ee98be7..ff72c0b 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -79,7 +79,7 @@ chown -R $app $final_path/{cache,feed-icons,lock}
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
 
-ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf"
+ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================
 # SPECIFIC RESTORATION
@@ -89,7 +89,7 @@ ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf"
 ynh_script_progression --message="Reinstalling dependencies..." --weight=6
 
 # Define and install dependencies
-ynh_install_app_dependencies php5-cli
+ynh_install_app_dependencies php${YNH_PHP_VERSION}-cli
 
 #=================================================
 # RESTORE THE MYSQL DATABASE
@@ -114,9 +114,9 @@ ynh_systemd_action --service_name=$app --action=start
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
-ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=2
+ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=2
 
-ynh_systemd_action --service_name=php7.0-fpm --action=reload
+ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 4eacfeb..17aa687 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -47,7 +47,7 @@ fi
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=7
+ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=7
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -73,12 +73,6 @@ ynh_secure_remove --file="/etc/cron.d/$app"
 # Normalize the URL path syntax
 path_url=$(ynh_normalize_url_path --path_url=$path_url)
 
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-
-ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -115,10 +109,10 @@ ynh_system_user_create --username=$app
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=2
+ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 
-# Create a dedicated php-fpm config
-ynh_add_fpm_config
+# Create a dedicated PHP-FPM config
+ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -198,7 +192,7 @@ yunohost service add $app
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..." --weight=2
+ynh_script_progression --message="Reloading NGINX web server..." --weight=2
 
 ynh_systemd_action --service_name=nginx --action=reload