diff --git a/README.md b/README.md
index cce19ed..3d69cb6 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Finally, if installing on a low-end ARM device (e.g. Raspberry Pi):
 
 To learn more about the philosophy and goals of the project, [visit **discourse.org**](http://www.discourse.org).
 
-**Shipped version:** 2.3.8
+**Shipped version:** 2.3.10
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index d79c796..66ea285 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,3 +1,3 @@
-SOURCE_URL=https://github.com/discourse/discourse/archive/v2.3.8.tar.gz
-SOURCE_SUM=b4557d2d27c292cb6c050c515e02554d68c31ff4c3fa0e476b350d07713b513f
+SOURCE_URL=https://github.com/discourse/discourse/archive/v2.3.10.tar.gz
+SOURCE_SUM=1f7a9672b983d876ed2719b3d347575a76000cc189bfa3e045341728f92fd3f8
 SOURCE_FORMAT=tar.gz
diff --git a/manifest.json b/manifest.json
index 25b01ad..22d646d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Discussion platform",
         "fr": "Plateforme de discussion"
     },
-    "version": "2.3.8~ynh1",
+    "version": "2.3.10~ynh1",
     "url": "http://Discourse.org",
     "license": "GPL-2.0",
     "maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 8ac62a9..35f4d9d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 #
 
 pkg_dependencies="g++ libjemalloc1 libjemalloc-dev zlib1g-dev libreadline-dev libpq-dev libssl-dev libyaml-dev libcurl4-openssl-dev libapr1-dev libxslt1-dev checkinstall libxml2-dev vim imagemagick postgresql postgresql-server-dev-all postgresql-contrib optipng jhead jpegoptim gifsicle brotli"
-RUBY_VERSION="2.6.0"
+RUBY_VERSION="2.6.5"
 
 # Execute a command as another user with login
 # (hence in user home dir, with prior loading of .profile, etc.)
@@ -395,8 +395,8 @@ ynh_install_ruby () {
   fi
   # Build an app.src for ruby-build
   mkdir -p "../conf"
-  echo "SOURCE_URL=https://github.com/rbenv/ruby-build/archive/v20181225.tar.gz
-SOURCE_SUM=5ace4787ace47384dc419b20f5eb5a59f1174e00bfabcfed74a175033cd0b18a" > "../conf/ruby-build.src"
+  echo "SOURCE_URL=https://github.com/rbenv/ruby-build/archive/v20200115.tar.gz
+SOURCE_SUM=e680eb8a606be358740fb0dfcf08309081fa27a54224e00fc7673ed2c842032d" > "../conf/ruby-build.src"
   # Download and extract ruby-build
   ynh_setup_source "$rbenv_install_dir/plugins/ruby-build" ruby-build
 	# Restore /usr/local/bin in PATH (if needed)
diff --git a/scripts/install b/scripts/install
index b7c2359..b6c9d84 100644
--- a/scripts/install
+++ b/scripts/install
@@ -208,7 +208,9 @@ if [ -n "$(uname -m | grep arm)" ] ; then
   exec_login_as $app bundle config specific_platform arm-linux
 fi
 # Install dependencies
-exec_login_as $app MAKEFLAGS=-j2 bundle install --jobs 2 --path vendor/bundle --with development
+exec_login_as $app bundle config set path 'vendor/bundle'
+exec_login_as $app bundle config set with 'development'
+exec_login_as $app MAKEFLAGS=-j2 bundle install --jobs 2
 
 # On ARM architecture, replace bundled libpsl by system native libpsl
 # because the provided binary isn't compatible
diff --git a/scripts/upgrade b/scripts/upgrade
index e451363..36832c7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -39,12 +39,6 @@ redis_db=$(ynh_app_setting_get $app redis_db)
 # Check memory requirements
 check_memory_requirements_upgrade
 
-#=================================================
-# ENABLE MAINTENANCE MODE
-#=================================================
-
-ynh_maintenance_mode_ON
-
 #=================================================
 # BACKUP BEFORE UPGRADE
 #=================================================
@@ -60,6 +54,13 @@ then
         ynh_restore_upgradebackup
     }
 fi
+
+#=================================================
+# ENABLE MAINTENANCE MODE
+#=================================================
+
+ynh_maintenance_mode_ON
+
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
@@ -231,7 +232,9 @@ if ! ynh_is_upstream_up_to_date ; then
 	  exec_login_as $app bundle config specific_platform arm-linux
 	fi
 	# Install dependencies
-	exec_login_as $app MAKEFLAGS=-j2 bundle install --jobs 2 --path vendor/bundle --with development
+	exec_login_as $app bundle config set path 'vendor/bundle'
+	exec_login_as $app bundle config set with 'development'
+	exec_login_as $app MAKEFLAGS=-j2 bundle install --jobs 2
 
 	# On ARM architecture, replace bundled libpsl by system native libpsl
 	# because the provided binary isn't compatible