diff --git a/README.md b/README.md
index e614642..2fc83c9 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,6 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 [Cachet](https://cachethq.io/) is a free, open source status page for your API, service or company. Built with all of the features that you'd expect from a status page, Cachet comes with a powerful API, a metric system, multiple user support, two factor authentication for added security and is easy to get setup. A powerful, self-hosted alternative to StatusPage.io and Status.io.
 
-![](https://github.com/CachetHQ/Assets/raw/master/images/logo/Cachet.png)
-
 **Shipped version:** 2.3.18
 
 ## Screenshots
diff --git a/conf/nginx.conf b/conf/nginx.conf
index d947358..976e546 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -18,7 +18,7 @@ location __PATH__/ {
 
   location ~ \.php$ {
             include fastcgi_params;
-            fastcgi_pass unix:/var/run/php/php__YNH_PHP_VERSION__-fpm-__NAME__.sock;
+            fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
             fastcgi_param SCRIPT_FILENAME $request_filename;
             fastcgi_index index.php;
             fastcgi_keep_conn on;
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 9ec5eb3..83c96be 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,6 +5,7 @@
 #=================================================
 
 YNH_PHP_VERSION="7.3"
+
 extra_php_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-sqlite3"
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index d437ad7..bab2e5a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -85,10 +85,8 @@ ynh_setup_source --dest_dir="$final_path"
 #=================================================
 ynh_script_progression --message="Configuring NGINX web server..." --weight=1
 
-### `ynh_add_nginx_config` will use the file conf/nginx.conf
-
-# Create a dedicated nginx config
-ynh_add_nginx_config YNH_PHP_VERSION
+# Create a dedicated NGINX config
+ynh_add_nginx_config
 
 #=================================================
 # CREATE DEDICATED USER
@@ -104,17 +102,15 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=8
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC SETUP
-#=================================================
-
 #=================================================
 # PRE-CONFIGURE CACHET
 #=================================================
-
 ynh_script_progression --message="Configuring Cachet..." --weight=10
+
 env_conf="$final_path/.env"
 
 cp $final_path/.env.example $env_conf
diff --git a/scripts/restore b/scripts/restore
index 1bf4248..13e1968 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,7 +6,6 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
@@ -83,8 +82,8 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6
 # Restore the file first, so it can have a backup if different
 ynh_restore_file --origin_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"
 
-# Recreate a dedicated php-fpm config
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+# Recreate a dedicated PHP-FPM config
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC RESTORATION
diff --git a/scripts/upgrade b/scripts/upgrade
index c776724..67ab5bc 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -79,15 +79,13 @@ path_url=$(ynh_normalize_url_path --path_url=$path_url)
 
 #=================================================
 # STANDARD UPGRADE STEPS
-#=================================================
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Recreate a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion="$YNH_PHP_VERSION" --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # SET MAINTENANCE MODE ON
@@ -125,8 +123,8 @@ fi
 #=================================================
 ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
 
-# Create a dedicated nginx config
-ynh_add_nginx_config YNH_PHP_VERSION
+# Create a dedicated NGINX config
+ynh_add_nginx_config
 
 #=================================================
 # CREATE DEDICATED USER