diff --git a/README.md b/README.md
index ccfe6cb..3c410dc 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 MyBB is the free and open source forum software powering thousands of engaging, vibrant, and unique communities across the internet.
 
-**Shipped version:** 1.8.30~ynh2
-
+**Shipped version:** 1.8.31~ynh1
 
 **Demo:** https://demomybb.tk/
 
diff --git a/README_fr.md b/README_fr.md
index 8f05895..1082db1 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,8 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 MyBB is the free and open source forum software powering thousands of engaging, vibrant, and unique communities across the internet.
 
-**Version incluse :** 1.8.30~ynh2
-
+**Version incluse :** 1.8.31~ynh1
 
 **Démo :** https://demomybb.tk/
 
diff --git a/conf/app.src b/conf/app.src
index 7f2ad20..6303a0f 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/mybb/mybb/releases/download/mybb_1830/mybb_1830.zip
-SOURCE_SUM=9ef240c451b4c324d4b9d5201e1c28a49e5bbccf7f8b6bcade115375b933bc2f
+SOURCE_URL=https://github.com/mybb/mybb/releases/download/mybb_1831/mybb_1831.zip
+SOURCE_SUM=e88354f10893512ea8f426aff9d6a48f7e2cb20bd3988b001c59c9f29084c2f1
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
diff --git a/manifest.json b/manifest.json
index de66368..5b164a9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Forum software",
         "fr": "Forum open source et libre"
     },
-    "version": "1.8.30~ynh2",
+    "version": "1.8.31~ynh1",
     "url": "https://mybb.com/",
     "upstream": {
         "license": "LGPL-3.0-only",
diff --git a/scripts/install b/scripts/install
index 2532de0..668fb22 100755
--- a/scripts/install
+++ b/scripts/install
@@ -92,14 +92,6 @@ chown -R $app:www-data "$final_path"
 #chmod 666 $final_path/inc/config.php $final_path/inc/settings.php
 chmod 775 $final_path/cache/ $final_path/cache/themes/ $final_path/uploads/ $final_path/uploads/avatars/
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=2
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -109,6 +101,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=3
 ynh_add_fpm_config
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..." --weight=2
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index a2c0156..1ab327f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -92,14 +92,6 @@ chown -R $app:www-data "$final_path"
 # chmod 666 "$final_path/inc/config.php"
 # chown $app:$app "$final_path/inc/config.php"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@@ -115,6 +107,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # RELOAD NGINX
 #=================================================