diff --git a/conf/cron b/conf/cron
index 776808b..a15c428 100644
--- a/conf/cron
+++ b/conf/cron
@@ -1,5 +1,5 @@
-@daily cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove
-@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl media remove-orphans
-@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl accounts cull
-@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl statuses remove
-@monthly cd __FINAL_PATH__/live && RAILS_ENV=production bin/tootctl preview_cards remove
+@daily cd __FINAL_PATH__/live && RAILS_ENV=production __RUBY_PATH__/tootctl media remove
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production __RUBY_PATH__/tootctl media remove-orphans
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production __RUBY_PATH__/tootctl accounts cull
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production __RUBY_PATH__/tootctl statuses remove
+@monthly cd __FINAL_PATH__/live && RAILS_ENV=production __RUBY_PATH__/tootctl preview_cards remove
diff --git a/scripts/install b/scripts/install
index 7d21d45..204bb52 100644
--- a/scripts/install
+++ b/scripts/install
@@ -75,9 +75,10 @@ ynh_app_setting_set --app=$app --key=port_stream --value=$port_stream
 #=================================================
 ynh_script_progression --message="Installing dependencies..."
 
-ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 ynh_install_app_dependencies $pkg_dependencies	
 ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
+ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
+ynh_install_ruby --ruby_version=$RUBY_VERSION
 
 #=================================================
 # CREATE A POSTGRESQL DATABASE
@@ -142,10 +143,10 @@ ynh_add_swap --size=$swap_needed
 #=================================================
 ynh_script_progression --message="Installing Ruby..."
 
-ynh_install_ruby --ruby_version=$RUBY_VERSION
 pushd "$final_path/live"
-	$RBENV_ROOT/versions/$app/bin/gem update --system
-	$RBENV_ROOT/versions/$app/bin/gem install bundler:$BUNDLER_VERSION --no-document
+	ynh_use_ruby
+	$ynh_gem update --system
+	$ynh_gem install bundler:$BUNDLER_VERSION --no-document
 popd
 
 #=================================================
@@ -181,17 +182,17 @@ ynh_script_progression --message="Installing Mastodon..."
 chown -R "$app": "$final_path"
 
 pushd "$final_path/live"
+	sudo -u $app $ynh_ruby_load_path $ruby_path/bundle config deployment 'true'
+	sudo -u $app $ynh_ruby_load_path $ruby_path/bundle config without 'development test'
+	sudo -u $app $ynh_ruby_load_path $ruby_path/bundle install -j$(getconf _NPROCESSORS_ONLN)
 	ynh_use_nodejs
-	sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle config deployment 'true'
-	sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle config without 'development test'
-	sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
-	sudo -u $app PATH=$PATH yarn install --pure-lockfile
+	sudo -u $app $ynh_node_load_PATH yarn install --pure-lockfile
 	echo "SAFETY_ASSURED=1">> $config
-	sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails db:setup --quiet
-	sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails assets:precompile --quiet
-	sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt
-	sudo -u $app RAILS_ENV=production PATH=$PATH bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > /dev/null
-	sudo -u $app RAILS_ENV=production PATH=$PATH bin/tootctl accounts modify "$admin" --approve
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails db:setup --quiet
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails assets:precompile --quiet
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role=admin > /dev/null
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/tootctl accounts modify "$admin" --approve
 popd
 
 vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$final_path/live/key.txt")
diff --git a/scripts/remove b/scripts/remove
index 6b16380..8a465a4 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -73,8 +73,8 @@ ynh_script_progression --message="Removing dependencies..."
 
 # Remove metapackage and its dependencies
 ynh_remove_ruby
-ynh_remove_app_dependencies
 ynh_remove_nodejs
+ynh_remove_app_dependencies
 ynh_remove_extra_repo
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index bbbe50b..27aaff0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -184,10 +184,10 @@ ynh_add_nginx_config 'port_web port_stream'
 #=================================================
 ynh_script_progression --message="Upgrading dependencies..."
 
-ynh_remove_nodejs
-ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 ynh_install_app_dependencies $pkg_dependencies
 ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
+ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
+ynh_install_ruby --ruby_version=$RUBY_VERSION
 
 #=================================================
 # CREATE DEDICATED USER
@@ -220,10 +220,10 @@ ynh_add_swap --size=$swap_needed
 #=================================================
 ynh_script_progression --message="Installing Ruby..."
 
-ynh_install_ruby --ruby_version=$RUBY_VERSION
 pushd "$final_path/live"
-	gem update --system
-	gem install bundler:$BUNDLER_VERSION --no-document
+	ynh_use_ruby
+	$ynh_gem update --system
+	$ynh_gem install bundler:$BUNDLER_VERSION --no-document
 popd
 
 #=================================================
@@ -243,15 +243,15 @@ ynh_script_progression --message="Upgrading Mastodon..."
 chown -R "$app": "$final_path"
 
 pushd "$final_path/live"
+	sudo -u $app $ynh_ruby_load_path $ruby_path/bundle config deployment 'true'
+	sudo -u $app $ynh_ruby_load_path $ruby_path/bundle config without 'development test'
+	sudo -u $app $ynh_ruby_load_path $ruby_path/bundle install -j$(getconf _NPROCESSORS_ONLN)
 	ynh_use_nodejs
-	sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle config deployment 'true'
-	sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle config without 'development test'
-	sudo -u $app PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
-	sudo -u $app PATH=$PATH yarn install --pure-lockfile
-	sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails assets:clean
-	sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails assets:precompile
-	sudo -u $app RAILS_ENV=production PATH=$PATH $RBENV_ROOT/versions/$app/bin/bundle exec rails db:migrate
-	sudo -u $app RAILS_ENV=production PATH=$PATH bin/tootctl cache clear
+	sudo -u $app $ynh_node_load_PATH yarn install --pure-lockfile
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails assets:clean
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails assets:precompile
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/bundle exec rails db:migrate
+	sudo -u $app RAILS_ENV=production $ynh_ruby_load_path $ruby_path/tootctl cache clear
 popd
 
 #=================================================
diff --git a/scripts/ynh_install_ruby__2 b/scripts/ynh_install_ruby__2
index 1d9bf8d..b8de713 100644
--- a/scripts/ynh_install_ruby__2
+++ b/scripts/ynh_install_ruby__2
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-# Need also the helper https://github.com/YunoHost-Apps/Experimental_helpers/blob/master/ynh_handle_getopts_args/ynh_handle_getopts_args
-
 rbenv_version=1.1.2
-rbenv_rubybuild_version=20201225
+ruby_build_version=20201225
 rbenv_aliases_version=1.1.0
 rbenv_install_dir="/opt/rbenv"
+ruby_version_path="$rbenv_install_dir/versions"
 # RBENV_ROOT is the directory of rbenv, it needs to be loaded as a environment variable.
 export RBENV_ROOT="$rbenv_install_dir"
 
@@ -14,37 +13,104 @@ export RBENV_ROOT="$rbenv_install_dir"
 # [internal]
 #
 # usage: ynh_install_rbenv
+#
+# Requires YunoHost version 2.7.12 or higher.
 ynh_install_rbenv () {
-  ynh_print_info --message="Installation of rbenv - Ruby Version Management - rbenv-${rbenv_version}/ruby-build-${rbenv_rubybuild_version}"
+    ynh_print_info --message="Installation of rbenv - Ruby Version Management - rbenv-${rbenv_version}/ruby-build-${ruby_build_version}"
 
-  # Build an app.src for rbenv
-  mkdir -p "../conf"
-  echo "SOURCE_URL=https://github.com/rbenv/rbenv/archive/v${rbenv_version}.tar.gz
+    # Build an app.src for rbenv
+    mkdir -p "../conf"
+    echo "SOURCE_URL=https://github.com/rbenv/rbenv/archive/v${rbenv_version}.tar.gz
 SOURCE_SUM=80ad89ffe04c0b481503bd375f05c212bbc7d44ef5f5e649e0acdf25eba86736" > "../conf/rbenv.src"
-  # Download and extract rbenv
-  ynh_setup_source --dest_dir="$rbenv_install_dir" --source_id=rbenv
+    # Download and extract rbenv
+    ynh_setup_source --dest_dir="$rbenv_install_dir" --source_id=rbenv
 
-  # Build an app.src for ruby-build
-  mkdir -p "../conf"
-  echo "SOURCE_URL=https://github.com/rbenv/ruby-build/archive/v${rbenv_rubybuild_version}.tar.gz
+    # Build an app.src for ruby-build
+    mkdir -p "../conf"
+    echo "SOURCE_URL=https://github.com/rbenv/ruby-build/archive/v${ruby_build_version}.tar.gz
 SOURCE_SUM=54cae123c2758e7714c66aca7ef8bc7f29cda8583891191ceb3053c6d098ecf1" > "../conf/ruby-build.src"
-  # Download and extract ruby-build
-  ynh_setup_source --dest_dir="$rbenv_install_dir/plugins/ruby-build" --source_id=ruby-build
+    # Download and extract ruby-build
+    ynh_setup_source --dest_dir="$rbenv_install_dir/plugins/ruby-build" --source_id=ruby-build
 
-  # Build an app.src for ruby-build
-  mkdir -p "../conf"
-  echo "SOURCE_URL=https://github.com/tpope/rbenv-aliases/archive/v${rbenv_aliases_version}.tar.gz
+    # Build an app.src for rbenv-aliases
+    mkdir -p "../conf"
+    echo "SOURCE_URL=https://github.com/tpope/rbenv-aliases/archive/v${rbenv_aliases_version}.tar.gz
 SOURCE_SUM=12e89bc4499e85d8babac2b02bc8b66ceb0aa3f8047b26728a3eca8a6030273d" > "../conf/rbenv-aliases.src"
-  # Download and extract ruby-build
-  ynh_setup_source --dest_dir="$rbenv_install_dir/plugins/rbenv-aliases" --source_id=rbenv-aliases
+    # Download and extract rbenv-aliases
+    ynh_setup_source --dest_dir="$rbenv_install_dir/plugins/rbenv-aliases" --source_id=rbenv-aliases
 
-  (cd $rbenv_install_dir
-  ./src/configure && make -C src)
+    (cd $rbenv_install_dir
+    ./src/configure && make -C src)
 
-# Create shims directory if needed
-if [ ! -d $rbenv_install_dir/shims ] ; then
-  mkdir $rbenv_install_dir/shims
-fi
+    # Create shims directory if needed
+    if [ ! -d $rbenv_install_dir/shims ] ; then
+        mkdir $rbenv_install_dir/shims
+    fi
+}
+
+# Load the version of Ruby for an app, and set variables.
+#
+# ynh_use_ruby has to be used in any app scripts before using Ruby for the first time.
+# This helper will provide alias and variables to use in your scripts.
+#
+# To use gem or Ruby, use the alias `ynh_gem` and `ynh_ruby`
+# Those alias will use the correct version installed for the app
+# For example: use `ynh_gem install` instead of `gem install`
+#
+# With `sudo` or `ynh_exec_as`, use instead the fallback variables `$ynh_gem` and `$ynh_ruby`
+# And propagate $PATH to sudo with $ynh_ruby_load_path
+# Exemple: `ynh_exec_as $app $ynh_ruby_load_path $ynh_gem install`
+#
+# $PATH contains the path of the requested version of Ruby.
+# However, $PATH is duplicated into $ruby_path to outlast any manipulation of $PATH
+# You can use the variable `$ynh_ruby_load_path` to quickly load your Ruby version
+#  in $PATH for an usage into a separate script.
+# Exemple: $ynh_ruby_load_path $final_path/script_that_use_gem.sh`
+#
+#
+# Finally, to start a Ruby service with the correct version, 2 solutions
+#  Either the app is dependent of Ruby or gem, but does not called it directly.
+#  In such situation, you need to load PATH
+#    `Environment="__YNH_RUBY_LOAD_ENV_PATH__"`
+#    `ExecStart=__FINALPATH__/my_app`
+#     You will replace __YNH_RUBY_LOAD_ENV_PATH__ with $ynh_ruby_load_path
+#
+#  Or Ruby start the app directly, then you don't need to load the PATH variable
+#    `ExecStart=__YNH_RUBY__ my_app run`
+#     You will replace __YNH_RUBY__ with $ynh_ruby
+#
+#
+# one other variable is also available
+#   - $ruby_path: The absolute path to Ruby binaries for the chosen version.
+#
+# usage: ynh_use_ruby
+#
+# Requires YunoHost version 2.7.12 or higher.
+ynh_use_ruby () {
+    # Get the absolute path of this version of Ruby
+    ruby_path="$ruby_version_path/$YNH_APP_INSTANCE_NAME/bin"
+
+    # Allow alias to be used into bash script
+    shopt -s expand_aliases
+
+    # Create an alias for the specific version of Ruby and a variable as fallback
+    ynh_ruby="$ruby_path/ruby"
+    alias ynh_ruby="$ynh_ruby"
+    # And gem
+    ynh_gem="$ruby_path/gem"
+    alias ynh_gem="$ynh_gem"
+
+    # Load the path of this version of Ruby in $PATH
+    if [[ :$PATH: != *":$ruby_path"* ]]; then
+        PATH="$ruby_path:$PATH"
+    fi
+    ruby_path="$PATH"
+    # Create an alias to easily load the PATH
+    ynh_ruby_load_path="PATH=$ruby_path"
+
+    # Sets the local application-specific Ruby version
+    (cd $final_path
+    rbenv local $ruby_version)
 }
 
 # Install a specific version of Ruby
@@ -64,132 +130,140 @@ fi
 #
 # usage: ynh_install_ruby --ruby_version=ruby_version
 # | arg: -v, --ruby_version= - Version of ruby to install.
+#
+# Requires YunoHost version 2.7.12 or higher.
 ynh_install_ruby () {
-  # Declare an array to define the options of this helper.
-  declare -Ar args_array=( [v]=ruby_version= )
-  local ruby_version
-  # Manage arguments with getopts
-  ynh_handle_getopts_args "$@"
+    # Declare an array to define the options of this helper.
+    local legacy_args=v
+    local -A args_array=( [v]=ruby_version= )
+    local ruby_version
+    # Manage arguments with getopts
+    ynh_handle_getopts_args "$@"
 
-  # Store ruby_version into the config of this app
-  ynh_app_setting_set --app=$YNH_APP_INSTANCE_NAME --key=ruby_version --value=$ruby_version
+    # Store ruby_version into the config of this app
+    ynh_app_setting_set --app=$YNH_APP_INSTANCE_NAME --key=ruby_version --value=$ruby_version
 
-  # Create $rbenv_install_dir if doesn't exist already
-  mkdir -p "$rbenv_install_dir/plugins/ruby-build"
+    # Create $rbenv_install_dir if doesn't exist already
+    mkdir -p "$rbenv_install_dir/plugins/ruby-build"
 
-  # Create the file if doesn't exist already
-  touch "$rbenv_install_dir/ynh_app_version"
+    # Load rbenv path in PATH
+    local CLEAR_PATH="$rbenv_install_dir/bin:$PATH"
 
-  # Load rbenv path in PATH
-  CLEAR_PATH="$rbenv_install_dir/bin:$PATH"
+    # Remove /usr/local/bin in PATH in case of Ruby prior installation
+    PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
 
-  # Remove /usr/local/bin in PATH in case of Ruby prior installation
-  PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
+    # Move an existing Ruby binary, to avoid to block rbenv
+    test -x /usr/bin/ruby && mv /usr/bin/ruby /usr/bin/ruby_rbenv
 
-  # Move an existing Ruby binary, to avoid to block rbenv
-  test -x /usr/bin/ruby && mv /usr/bin/ruby /usr/bin/ruby_rbenv
-
-  # If rbenv is not previously setup, install it
-  if ! type rbenv > /dev/null 2>&1
-  then
-    ynh_install_rbenv
-  elif dpkg --compare-versions "$($rbenv_install_dir/bin/rbenv --version | cut -d" " -f2)" lt ${rbenv_version}
-  then
-    ynh_install_rbenv
-  elif dpkg --compare-versions "$($rbenv_install_dir/plugins/ruby-build/bin/ruby-build --version | cut -d" " -f2)" lt ${rbenv_rubybuild_version}
-  then
-    ynh_install_rbenv
-  fi
-
-  # Restore /usr/local/bin in PATH (if needed)
-  PATH=$CLEAR_PATH
-
-  # And replace the old Ruby binary
-  test -x /usr/bin/ruby_rbenv && mv /usr/bin/ruby_rbenv /usr/bin/ruby
-
-  # Install the requested version of Ruby
-  ynh_print_info --message="Installation of Ruby-"$ruby_version
-  CONFIGURE_OPTS="--disable-install-doc --with-jemalloc" MAKE_OPTS="-j2" rbenv install --skip-existing $ruby_version
-
-  # Do not add twice the same line
-  if ! grep --quiet "$YNH_APP_INSTANCE_NAME:$ruby_version" "$rbenv_install_dir/ynh_app_version"
-  then
-
-    # Remove previous version
-    if grep --quiet "$YNH_APP_INSTANCE_NAME:" "$rbenv_install_dir/ynh_app_version"
+    # If rbenv is not previously setup, install it
+    if ! type rbenv > /dev/null 2>&1
+    then
+        ynh_install_rbenv
+    elif dpkg --compare-versions "$($rbenv_install_dir/bin/rbenv --version | cut -d" " -f2)" lt $rbenv_version
+    then
+        ynh_install_rbenv
+    elif dpkg --compare-versions "$($rbenv_install_dir/plugins/ruby-build/bin/ruby-build --version | cut -d" " -f2)" lt $ruby_build_version
+    then
+        ynh_install_rbenv
+    elif dpkg --compare-versions "$($rbenv_install_dir/plugins/rbenv-aliases/bin/rbenv-aliases --version | cut -d" " -f2)" lt $rbenv_aliases_version
+    then
+        ynh_install_rbenv
+    fi
+
+    # Restore /usr/local/bin in PATH
+    PATH=$CLEAR_PATH
+
+    # And replace the old Ruby binary
+    test -x /usr/bin/ruby_rbenv && mv /usr/bin/ruby_rbenv /usr/bin/ruby
+
+    # Install the requested version of Ruby
+    ynh_print_info --message="Installation of Ruby-"$ruby_version
+    CONFIGURE_OPTS="--disable-install-doc --with-jemalloc" MAKE_OPTS="-j2" rbenv install --skip-existing $ruby_version
+
+    # Remove app virtualenv
+    if  `rbenv alias --list | grep --quiet "$YNH_APP_INSTANCE_NAME" 1>/dev/null 2>&1`
     then
-      if  grep --quiet "$YNH_APP_INSTANCE_NAME" $(rbenv alias --list)
-      then
         rbenv alias $YNH_APP_INSTANCE_NAME --remove
-      fi
-      sed --in-place "/$YNH_APP_INSTANCE_NAME:/d" "$rbenv_install_dir/ynh_app_version"
     fi
 
-    # Store the ID of this app and the version of Ruby requested for it
-    echo "$YNH_APP_INSTANCE_NAME:$ruby_version" | tee --append "$rbenv_install_dir/ynh_app_version"
-  fi
+    # Create app virtualenv
+    rbenv alias $YNH_APP_INSTANCE_NAME $ruby_version
 
-  # Remove no more needed Ruby version
-  installed_ruby_version=$(rbenv versions --bare --skip-aliases | grep -Ev '/')
-  for installed_version in $installed_ruby_version
-  do
-    if ! grep --quiet "$installed_version" "$rbenv_install_dir/ynh_app_version"
-    then
-      ynh_print_info --message="Removing of ruby-"$installed_version
-      $rbenv_install_dir/bin/rbenv uninstall --force $installed_version
-    fi
-  done
+    # Cleanup Ruby versions
+    ynh_cleanup_ruby
 
-  # Set environment for Ruby users
-  echo  "#rbenv
+    # Set environment for Ruby users
+    echo  "#rbenv
 export RBENV_ROOT=$rbenv_install_dir
 export PATH=\"$rbenv_install_dir/bin:$PATH\"
 eval \"\$(rbenv init -)\"
-#rbenv" > /etc/profile.d/rbenv.sh
+    #rbenv" > /etc/profile.d/rbenv.sh
 
-  # Load the environment
-  eval "$(rbenv init -)"
-
-  (cd $final_path
-  rbenv local $ruby_version)
-
-  rbenv alias $YNH_APP_INSTANCE_NAME $ruby_version
+    # Load the environment
+    eval "$(rbenv init -)"
 }
 
 # Remove the version of Ruby used by the app.
 #
-# This helper will check if another app uses the same version of Ruby,
-# if not, this version of Ruby will be removed.
-# If no other app uses Ruby, rbenv will be also removed.
+# This helper will also cleanup Ruby versions
 #
 # usage: ynh_remove_ruby
 ynh_remove_ruby () {
-  local ruby_version=$(ynh_app_setting_get --app=$YNH_APP_INSTANCE_NAME --key=ruby_version)
+    local ruby_version=$(ynh_app_setting_get --app=$YNH_APP_INSTANCE_NAME --key=ruby_version)
 
-  # Load rbenv path in PATH
-  CLEAR_PATH="$rbenv_install_dir/bin:$PATH"
+    # Load rbenv path in PATH
+    local CLEAR_PATH="$rbenv_install_dir/bin:$PATH"
 
-  # Remove /usr/local/bin in PATH in case of Ruby prior installation
-  PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
+    # Remove /usr/local/bin in PATH in case of Ruby prior installation
+    PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
 
-rbenv alias $YNH_APP_INSTANCE_NAME --remove
+    rbenv alias $YNH_APP_INSTANCE_NAME --remove
 
-  # Remove the line for this app
-  sed --in-place "/$YNH_APP_INSTANCE_NAME:$ruby_version/d" "$rbenv_install_dir/ynh_app_version"
+    # Remove the line for this app
+    ynh_app_setting_delete --app=$YNH_APP_INSTANCE_NAME --key=ruby_version
 
-  # If no other app uses this version of Ruby, remove it.
-  if ! grep --quiet "$ruby_version" "$rbenv_install_dir/ynh_app_version"
-  then
-    ynh_print_info --message="Removing of Ruby-"$ruby_version
-    $rbenv_install_dir/bin/rbenv uninstall --force $ruby_version
-  fi
-
-  # If no other app uses rbenv, remove rbenv and dedicated group
-  if [ ! -s "$rbenv_install_dir/ynh_app_version" ]
-  then
-    ynh_print_info --message="Removing of rbenv"
-    ynh_secure_remove --file="$rbenv_install_dir"
-    # Remove rbenv environment configuration
-    rm /etc/profile.d/rbenv.sh
-  fi
+    # Cleanup Ruby versions
+    ynh_cleanup_ruby
 }
+
+# Remove no more needed versions of Ruby used by the app.
+#
+# This helper will check what Ruby version are no more required,
+# and uninstall them
+# If no app uses Ruby, rbenv will be also removed.
+#
+# usage: ynh_cleanup_ruby
+ynh_cleanup_ruby () {
+
+    # List required Ruby version
+    local installed_apps=$(yunohost app list | grep -oP 'id: \K.*$')
+    local required_ruby_versions=""
+    for installed_app in $installed_apps
+    do
+        local installed_app_ruby_version=$(yunohost app setting $installed_app ruby_version)
+        if [[ $installed_app_ruby_version ]]
+        then
+            required_ruby_versions="${installed_app_ruby_version}\n${required_ruby_versions}"
+        fi
+    done
+    
+    # Remove no more needed Ruby version
+    local installed_ruby_versions=$(rbenv versions --bare --skip-aliases | grep -Ev '/')
+    for installed_ruby_version in $installed_ruby_versions
+    do
+        if ! `echo ${required_ruby_versions} | grep "${installed_ruby_version}" 1>/dev/null 2>&1`
+        then
+            ynh_print_info --message="Removing of Ruby-"$installed_ruby_version
+            $rbenv_install_dir/bin/rbenv uninstall --force $installed_ruby_version
+        fi
+    done
+
+    # If none Ruby version is required
+    if [[ ! $required_ruby_versions ]]
+    then
+        # Remove rbenv environment configuration
+        ynh_print_info --message="Removing of rbenv-"$rbenv_version
+        ynh_secure_remove --file="$rbenv_install_dir"
+        rm /etc/profile.d/rbenv.sh
+    fi
+}    
\ No newline at end of file