diff --git a/scripts/install b/scripts/install
index 3bae370..4af30b4 100644
--- a/scripts/install
+++ b/scripts/install
@@ -208,17 +208,33 @@ ynh_replace_string "#SMTP_OPENSSL_VERIFY_MODE=peer"              "SMTP_OPENSSL_V
 # Give right permission for the app
 chown -R "$app": "$final_path"
 
+# Install ruby 2.5.1
 (
-	cd "$final_path/live"
-	su mastodon <<INSTALL
-		$final_path/.rbenv/versions/2.5.3/bin/gem install bundler
-		$final_path/.rbenv/versions/2.5.3/bin/gem bundle update --bundler
-		$final_path/live/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test 
-		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
+	exec_as "$app" $final_path/.rbenv/bin/rbenv install -s 2.5.3 || true
+	exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.3 || true
+	exec_as "$app" $final_path/.rbenv/versions/2.5.3/bin/ruby -v
+)
+
+# Create symlink for ruby
+rm /usr/bin/ruby || true
+ln -s $final_path/.rbenv/versions/2.5.3/bin/ruby /usr/bin/ruby || true
+
+# Preconfig CSS & JS
+# Install Mastodon
+(
+sudo su - $app <<MCOMMANDS
+pushd ~/live
+$final_path/.rbenv/versions/2.5.3/bin/gem install bundler
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+	$final_path/.rbenv/versions/2.5.3/bin/bundle install --deployment --without development test
+else
+	$final_path/.rbenv/versions/2.5.3/bin/bundle install --deployment --force --without development test
+fi
+yarn install --pure-lockfile
+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
+MCOMMANDS
 )
 
 #=================================================