diff --git a/README.md b/README.md
index 926ab36..103ebcd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Mastodon for YunoHost
 
-[![Latest Version](https://img.shields.io/badge/version-2.2.0-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
+[![Latest Version](https://img.shields.io/badge/version-2.4.0-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
 [![Status](https://img.shields.io/badge/status-testing-yellow.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/milestones)
 [![Dependencies](https://img.shields.io/badge/dependencies-includes-lightgrey.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh#dependencies)
 [![GitHub license](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/YunoHost-Apps/mastodon_ynh/master/LICENSE)
diff --git a/conf/app-mastodon.src b/conf/app-mastodon.src
index 62d10c6..84b72fb 100644
--- a/conf/app-mastodon.src
+++ b/conf/app-mastodon.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.3.3.tar.gz
-SOURCE_SUM=b2b2e2ee7cc034e92258263500c423b900611407db67682777eef0526118f66e
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.4.0.tar.gz
+SOURCE_SUM=3d4904f30c28591333b1cf4c03173849dd6983ab00685f61e50e594160c672ee
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/crontab_mastodon b/conf/crontab_mastodon
deleted file mode 100644
index 62caff0..0000000
--- a/conf/crontab_mastodon
+++ /dev/null
@@ -1,7 +0,0 @@
-@daily __APP__ cd /opt/__APP__/live && RAILS_ENV=production /opt/__APP__/.rbenv/shims/bundle exec rake mastodon:media:clear
-
-@daily __APP__ cd /opt/__APP__/live && RAILS_ENV=production /opt/__APP__/.rbenv/shims/bundle exec rake mastodon:push:refresh
-
-@daily __APP__ cd /opt/__APP__/live && RAILS_ENV=production /opt/__APP__/.rbenv/shims/bundle exec rake mastodon:feeds:clear
-
-@daily __APP__ cd /opt/__APP__/live && RAILS_ENV=production /opt/__APP__/.rbenv/shims/bundle exec rake mastodon:users:clear
diff --git a/manifest.json b/manifest.json
index dc1bde6..3e6e9b4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
 		"en": "Mastodon is a free, open-source social network.",
 		"fr": "Mastodon est un réseau social gratuit et open source."
 	},
-	"version": "2.3.3-1",
+	"version": "2.4.0",
 	"url": "https://github.com/tootsuite/mastodon",
 	"license": "AGPL-3.0-or-later",
 	"maintainer": {
diff --git a/scripts/backup b/scripts/backup
index 5e134ac..0846afe 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -65,16 +65,10 @@ ynh_backup "/etc/systemd/system/$app-web.service"
 ynh_backup "/etc/systemd/system/$app-sidekiq.service"
 ynh_backup "/etc/systemd/system/$app-streaming.service"
 
-#=================================================
-# BACKUP THE CRON FILE
-#=================================================
-
-# Copy the nginx conf files
-ynh_backup "/etc/cron.d/$app"
-
 #=================================================
 # BACKUP THE sources.list FILES
 #=================================================
-
-ynh_backup "/etc/apt/sources.list.d/backports.list" "apt_backports.list"
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+	ynh_backup "/etc/apt/sources.list.d/backports.list" "apt_backports.list"
+fi
 ynh_backup "/etc/apt/sources.list.d/yarn.list" "apt_yarn.list"
diff --git a/scripts/install b/scripts/install
index 8e505e7..cbce4e3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,7 +80,9 @@ if [[ "$arch" = arm*  ]]; then
 fi
 
 # Install source.list debian package backports & yarn
-cp ../conf/backports.list /etc/apt/sources.list.d/
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+sudo cp ../conf/backports.list /etc/apt/sources.list.d/
+fi
 curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 cp ../conf/yarn.list /etc/apt/sources.list.d/
 ynh_package_update
@@ -170,14 +172,14 @@ eval \"\$(rbenv init -)\"" > $final_path/.profile
 
 # Install ruby-build
 (
-	exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.0
-	exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.0
-	exec_as "$app" $final_path/.rbenv/versions/2.5.0/bin/ruby -v
+	exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.1
+	exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.1
+	exec_as "$app" $final_path/.rbenv/versions/2.5.1/bin/ruby -v
 )
 
 # Create symlink for ruby
 rm /usr/bin/ruby || true
-ln -s $final_path/.rbenv/versions/2.5.0/bin/ruby /usr/bin/ruby || true
+ln -s $final_path/.rbenv/versions/2.5.1/bin/ruby /usr/bin/ruby || true
 
 # Adjust Mastodon config
 # TODO: use official helper ynh_replace_string
@@ -214,13 +216,12 @@ sed -i "s@#SMTP_OPENSSL_VERIFY_MODE=peer@SMTP_OPENSSL_VERIFY_MODE=none@g" "${fin
 (
 	cd "$final_path/live"
 	su mastodon <<INSTALL
-$final_path/.rbenv/versions/2.5.0/bin/gem install bundler
-$final_path/live/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test --quiet
-yarn install --production --no-progress --non-interactive --silent
-
-echo "SAFETY_ASSURED=1">> .env.production
-RAILS_ENV=production $final_path/live/bin/bundle exec rails db:migrate --quiet
-RAILS_ENV=production $final_path/live/bin/bundle exec rails assets:precompile --quiet
+		$final_path/.rbenv/versions/2.5.1/bin/gem install bundler
+		$final_path/live/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test --quiet
+		yarn install --production --no-progress --non-interactive --silent
+		echo "SAFETY_ASSURED=1">> .env.production
+		RAILS_ENV=production $final_path/live/bin/bundle exec rails db:migrate --quiet
+		RAILS_ENV=production $final_path/live/bin/bundle exec rails assets:precompile --quiet
 INSTALL
 )
 
@@ -246,10 +247,6 @@ RAILS_ENV=production bin/bundle exec rails mastodon:confirm_email USER_EMAIL=$ad
 SETADMIN
 )
 
-# Install crontab
-cp ../conf/crontab_mastodon /etc/cron.d/$app
-sed -i "s@__APP__@$app@g" /etc/cron.d/$app
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 0c39054..e939908 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -98,12 +98,13 @@ ynh_secure_remove /etc/cron.d/$app
 #=================================================
 # REMOVE source.list
 #=================================================
-
-ynh_secure_remove /etc/apt/sources.list.d/backports.list
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+	ynh_secure_remove /etc/apt/sources.list.d/backports.list
+fi
 ynh_secure_remove /etc/apt/sources.list.d/yarn.list
 
 # Delete ruby exec
-ynh_secure_remove /usr/bin/ruby
+#ynh_secure_remove /usr/bin/ruby
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/restore b/scripts/restore
index b9798a7..a800966 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -88,7 +88,9 @@ if [[ "$arch" = arm*  ]]; then
 fi
 
 # Install source.list debian package backports & yarn
-cp ../conf/backports.list /etc/apt/sources.list.d/
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+	cp ../conf/backports.list /etc/apt/sources.list.d/
+fi
 curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 cp ../conf/yarn.list /etc/apt/sources.list.d/
 ynh_package_update
@@ -146,12 +148,6 @@ ynh_restore_file "/etc/systemd/system/$app-sidekiq.service"
 ynh_restore_file "/etc/systemd/system/$app-streaming.service"
 systemctl enable "$app-web" "$app-sidekiq" "$app-streaming"
 
-#=================================================
-# RESTORE THE CRON FILE
-#=================================================
-
-ynh_restore_file "/etc/cron.d/$app"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 54cdd8f..3858ee8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -15,6 +15,7 @@ source /usr/share/yunohost/helpers
 
 # See comments in install script
 app=$YNH_APP_INSTANCE_NAME
+db_name=$app
 
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)
@@ -22,6 +23,7 @@ path=$(ynh_app_setting_get "$app" path)
 admin=$(ynh_app_setting_get "$app" admin)
 language=$(ynh_app_setting_get "$app" language)
 final_path=$(ynh_app_setting_get "$app" final_path)
+path_url="/"
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -63,44 +65,14 @@ ynh_abort_if_errors
 #=================================================
 
 # Normalize the URL path syntax
-path_url=$(ynh_normalize_url_path $path_url)
+#path_url=$(ynh_normalize_url_path $path_url)
 
 #=================================================
-# STANDARD UPGRADE STEPS
+# INSTALL DEPENDENCIES
 #=================================================
-# TODO TODO TODO
-#=================================================
-
-db_name=$app
-
-# Modify Nginx configuration file and copy it to Nginx conf directory
-sudo sed -i "s@__PATH__@$app@g" ../conf/nginx.conf*
-sudo sed -i "s@__FINALPATH__@$final_path@g" ../conf/nginx.conf*
-sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
-
-# Stop Mastodon Services
-sudo systemctl stop mastodon-*.service
-
-# Change owner of live folder
-sudo chown -R $app: $final_path/live
-
-# Download Mastodon
-sudo su - $app <<PULLCOMMANDS
-pushd ~/live
-git fetch -t
-git reset --hard origin/master
-git pull https://github.com/tootsuite/mastodon.git master
-PULLCOMMANDS
-
-# Switch branch to tagged release
-cd $final_path/live
-version=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | grep tag_name | cut -d\" -f4)
-sudo su - $app <<SWITCHCOMMANDS
-pushd ~/live
-git checkout $version
-SWITCHCOMMANDS
 
 # upgrade Node.js v4 to v6
+# TODO: use https://github.com/YunoHost-Apps/Experimental_helpers/blob/master/ynh_install_nodejs/ynh_install_nodejs
 node_version=$(nodejs --version)
 if [[ $node_version =~ ^v4.*$  ]]; then
 	pushd /opt
@@ -109,49 +81,103 @@ if [[ $node_version =~ ^v4.*$  ]]; then
 fi
 
 # add additional package for upgrade
-ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev postgresql-server-dev-9.4
+ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev postgresql-server-dev-all
 
-# Install ruby 2.5.0 for release 2.0
-sudo su - $app <<RCOMMANDS
-cd $final_path/.rbenv && git pull && cd -
-cd $final_path/.rbenv/plugins/ruby-build && git pull && cd -
-$final_path/.rbenv/bin/rbenv install 2.5.0 || true
-$final_path/.rbenv/versions/2.5.0/bin/ruby -v
-RCOMMANDS
+#=================================================
+# STANDARD UPGRADE STEPS
+#=================================================
 
-# Create symlink for ruby 2.5.0
-sudo rm /usr/bin/ruby || true
-sudo ln -s $final_path/.rbenv/versions/2.5.0/bin/ruby /usr/bin/ruby || true
+# Stop Mastodon Services
+# Restart Mastodon
+yunohost service stop "$app-web"
+yunohost service stop "$app-sidekiq"
+yunohost service stop "$app-streaming"
 
+# Change owner of live folder
+chown -R $app: $final_path/live
+
+# Download Mastodon
+ynh_setup_source "$final_path/live"                      "app-mastodon"
+
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+
+# TODO: use official helper ynh_add_nginx_config
+# Modify Nginx configuration file and copy it to Nginx conf directory
+sed -i "s@__PATH__@$app@g" ../conf/nginx.conf*
+sed -i "s@__FINALPATH__@$final_path@g" ../conf/nginx.conf*
+cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
+
+# Upgrade rbenv and ruby plugins
+ynh_setup_source "$final_path/.rbenv"                    "app-rbenv"
+ynh_setup_source "$final_path/.rbenv/plugins/ruby-build" "app-ruby-build"
+
+# Install ruby 2.5.1
+(
+	exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.1 || true
+	exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.1 || true
+	exec_as "$app" $final_path/.rbenv/versions/2.5.1/bin/ruby -v
+)
+
+# Create symlink for ruby
+rm /usr/bin/ruby || true
+ln -s $final_path/.rbenv/versions/2.5.1/bin/ruby /usr/bin/ruby || true
+
+# Preconfig CSS & JS
 # Install Mastodon
+(
 sudo su - $app <<MCOMMANDS
 pushd ~/live
-$final_path/.rbenv/versions/2.5.0/bin/gem install bundler
-bin/bundle install --deployment --without development test
+$final_path/.rbenv/versions/2.5.1/bin/gem install bundler
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+	$final_path/.rbenv/versions/2.5.1/bin/bundle install --deployment --without development test
+else
+	$final_path/.rbenv/versions/2.5.1/bin/bundle install --deployment --force --without development test
+fi
 yarn install --pure-lockfile
 MCOMMANDS
+)
 
 # Apply Mastodon upgrade
+(
+pushd $final_path/live
+RAILS_ENV=production $final_path/.rbenv/versions/2.5.1/bin/bundle exec rails assets:clean
+RAILS_ENV=production $final_path/.rbenv/versions/2.5.1/bin/bundle exec rails assets:precompile
+popd
+
 sudo su - $app <<COMMANDS
 pushd ~/live
-RAILS_ENV=production bundle exec rails assets:clean
-RAILS_ENV=production bundle exec rails assets:precompile
-RAILS_ENV=production bundle exec rails db:migrate
+RAILS_ENV=production $final_path/.rbenv/versions/2.5.1/bin/bundle exec rails db:migrate
 # Upgrade to 2.2.0
-RAILS_ENV=production bundle exec rails mastodon:maintenance:remove_regeneration_markers
+RAILS_ENV=production $final_path/.rbenv/versions/2.5.1/bin/bundle exec rails mastodon:maintenance:remove_regeneration_markers
 COMMANDS
+)
+#=================================================
+# RESTART MASTODON
+#=================================================
 
-# Restart Mastodon
-sudo systemctl start mastodon-*.service
+yunohost service start "$app-web"
+yunohost service start "$app-sidekiq"
+yunohost service start "$app-streaming"
 
 # Waiting start all services
 sleep 30
 
-# Reload Nginx
-sudo systemctl reload nginx
+#=================================================
+# RELOAD NGINX
+#=================================================
+
+systemctl reload nginx
+
+#=================================================
+# SETUP SSOWAT
+#=================================================
 
-# Set app public
 ynh_app_setting_set "$app" unprotected_uris "/"
 
-# Reload SSOwat configuration
+#=================================================
+# RELOAD ssowatconf
+#=================================================
+
 sudo yunohost app ssowatconf