diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
deleted file mode 100755
index aba8f0b..0000000
--- a/.github/workflows/updater.sh
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/bash
-
-#=================================================
-# PACKAGE UPDATING HELPER
-#=================================================
-
-# This script is meant to be run by GitHub Actions
-# The YunoHost-Apps organisation offers a template Action to run this script periodically
-# Since each app is different, maintainers can adapt its contents so as to perform
-# automatic actions when a new upstream release is detected.
-
-#=================================================
-# FETCHING LATEST RELEASE AND ITS ASSETS
-#=================================================
-
-# Fetching information
-current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
-repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
-# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
-version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1)
-assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'"))
-
-# Later down the script, we assume the version has only digits and dots
-# Sometimes the release name starts with a "v", so let's filter it out.
-# You may need more tweaks here if the upstream repository has different naming conventions. 
-if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
-    version=${version:1}
-fi
-
-# Setting up the environment variables
-echo "Current version: $current_version"
-echo "Latest release from upstream: $version"
-echo "VERSION=$version" >> $GITHUB_ENV
-echo "REPO=$repo" >> $GITHUB_ENV
-# For the time being, let's assume the script will fail
-echo "PROCEED=false" >> $GITHUB_ENV
-
-# Proceed only if the retrieved version is greater than the current one
-if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then
-    echo "::warning ::No new version available"
-    exit 0
-# Proceed only if a PR for this new version does not already exist
-elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then
-    echo "::warning ::A branch already exists for this update"
-    exit 0
-fi
-
-# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.)
-echo "${#assets[@]} available asset(s)"
-
-#=================================================
-# UPDATE SOURCE FILES
-#=================================================
-
-# Here we use the $assets variable to get the resources published in the upstream release.
-# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like.
-
-# Let's loop over the array of assets URLs
-for asset_url in ${assets[@]}; do
-
-echo "Handling asset at $asset_url"
-
-# Assign the asset to a source file in conf/ directory
-# Here we base the source file name upon a unique keyword in the assets url (admin vs. update)
-# Leave $src empty to ignore the asset
-case $asset_url in
-  *"tar.gz"*)
-    src="app"
-    ;;
-  *)
-    src=""
-    ;;
-esac
-
-# If $src is not empty, let's process the asset
-if [ ! -z "$src" ]; then
-
-# Create the temporary directory
-tempdir="$(mktemp -d)"
-
-# Download sources and calculate checksum
-filename=${asset_url##*/}
-curl --silent -4 -L $asset_url -o "$tempdir/$filename"
-checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
-
-# Delete temporary directory
-rm -rf $tempdir
-
-# Get extension
-if [[ $filename == *.tar.gz ]]; then
-  extension=tar.gz
-else
-  extension=${filename##*.}
-fi
-
-# Rewrite source file
-cat <<EOT > conf/$src.src
-SOURCE_URL=$asset_url
-SOURCE_SUM=$checksum
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=$extension
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-EOT
-echo "... conf/$src.src updated"
-
-else
-echo "... asset ignored"
-fi
-
-done
-
-#=================================================
-# SPECIFIC UPDATE STEPS
-#=================================================
-
-# Any action on the app's source code can be done.
-# The GitHub Action workflow takes care of committing all changes after this script ends.
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-
-# Replace new version in manifest
-echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json
-
-# No need to update the README, yunohost-bot takes care of it
-
-# The Action will proceed only if the PROCEED environment variable is set to true
-echo "PROCEED=true" >> $GITHUB_ENV
-exit 0
diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
deleted file mode 100644
index 4363d38..0000000
--- a/.github/workflows/updater.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected.
-# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization.
-# This file should be enough by itself, but feel free to tune it to your needs.
-# It calls updater.sh, which is where you should put the app-specific update steps.
-name: Check for new upstream releases
-on:
-  # Allow to manually trigger the workflow
-  workflow_dispatch:
-  # Run it every day at 6:00 UTC
-  schedule:
-    - cron:  '0 6 * * *'
-jobs:
-  updater:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fetch the source code
-        uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run the updater script
-        id: run_updater
-        run: |
-          # Setting up Git user
-          git config --global user.name 'yunohost-bot'
-          git config --global user.email 'yunohost-bot@users.noreply.github.com'
-          # Run the updater script
-          /bin/bash .github/workflows/updater.sh
-      - name: Commit changes
-        id: commit
-        if: ${{ env.PROCEED == 'true' }}
-        run: |
-          git commit -am "Upgrade to v$VERSION"
-      - name: Create Pull Request
-        id: cpr
-        if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: Update to version ${{ env.VERSION }}
-          committer: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          author: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          signoff: false
-          base: testing
-          branch: ci-auto-update-v${{ env.VERSION }}
-          delete-branch: true
-          title: 'Upgrade to version ${{ env.VERSION }}'
-          body: |
-            Upgrade to v${{ env.VERSION }}
-            [See upstream release page](https://github.com/${{ env.REPO }}/releases/tag/v${{ env.VERSION }})
-          draft: false
diff --git a/README.md b/README.md
index 2e40164..1a7c493 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ a public page.
 - 📥️ **Import your collection** from many other [recipe managers](https://docs.tandoor.dev/features/import_export/)
 - ➕ Many more like recipe scaling, image compression, printing views and supermarkets
 
-**Shipped version:** 1.5.11~ynh1
+**Shipped version:** 1.5.11~ynh2
 
 **Demo:** https://app.tandoor.dev/accounts/login/?demo
 
@@ -53,13 +53,6 @@ a public page.
 
 ![Screenshot of Tandoor](./doc/screenshots/example.jpg)
 
-## Disclaimers / important information
-
-* Known limitations:
-    * Requires a full dedicated domain for now
-
-* Specific Steps
-    * The first time the app is installed, you need to setup the initial super user. If you directly login with your YunoHost user's credentials, you will not be able to create the superuser from the web interface.
 ## Documentation and resources
 
 * Official app website: <https://tandoor.dev>
diff --git a/README_fr.md b/README_fr.md
index fc410f5..bd6c99e 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -45,7 +45,7 @@ a public page.
 - 📥️ **Import your collection** from many other [recipe managers](https://docs.tandoor.dev/features/import_export/)
 - ➕ Many more like recipe scaling, image compression, printing views and supermarkets
 
-**Version incluse :** 1.5.11~ynh1
+**Version incluse :** 1.5.11~ynh2
 
 **Démo :** https://app.tandoor.dev/accounts/login/?demo
 
@@ -53,13 +53,6 @@ a public page.
 
 ![Capture d’écran de Tandoor](./doc/screenshots/example.jpg)
 
-## Avertissements / informations importantes
-
-* Known limitations:
-    * Requires a full dedicated domain for now
-
-* Specific Steps
-    * The first time the app is installed, you need to setup the initial super user. If you directly login with your YunoHost user's credentials, you will not be able to create the superuser from the web interface.
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://tandoor.dev>
diff --git a/check_process b/check_process
deleted file mode 100644
index 9e1bf62..0000000
--- a/check_process
+++ /dev/null
@@ -1,23 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		is_public=1
-		port="666"
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=0
-		setup_root=1
-		setup_nourl=0
-		setup_private=0
-		setup_public=1
-		upgrade=1
-		backup_restore=1
-		multi_instance=1
-		change_url=0
-;;; Options
-Email=
-Notification=none
-;;; Upgrade options
-	; commit=CommitHash
-		name=Name and date of the commit.
-		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666&
diff --git a/conf/.env.template b/conf/.env.template
index 86cf6a2..3bf9550 100644
--- a/conf/.env.template
+++ b/conf/.env.template
@@ -51,7 +51,7 @@ SHOPPING_MIN_AUTOSYNC_INTERVAL=5
 # If staticfiles are stored at a different location uncomment and change accordingly, MUST END IN /
 # this is not required if you are just using a subfolder
 # This can either be a relative path from the applications base path or the url of an external host
-#sub_path_only STATIC_URL=__FINAL_PATH__/static/
+#sub_path_only STATIC_URL=__INSTALL_DIR__/source/static/
 
 # If mediafiles are stored at a different location uncomment and change accordingly, MUST END IN /
 # this is not required if you are just using a subfolder
@@ -161,4 +161,3 @@ AUTH_LDAP_USER_SEARCH_FILTER_STR="(&(|(objectclass=posixAccount))(uid=%(user)s)(
 
 # Recipe exports are cached for a certain time by default, adjust time if needed
 # EXPORT_FILE_CACHE_DURATION=600
-
diff --git a/conf/app.src b/conf/app.src
deleted file mode 100644
index 4b3c653..0000000
--- a/conf/app.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/TandoorRecipes/recipes/archive/refs/tags/1.5.11.tar.gz
-SOURCE_SUM=deda304272a3a327eb24cd83dce61acfd86470a9bb885d31269ea01c6d1f9f14
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 9b96631..b1dad4b 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -18,7 +18,7 @@ location __PATH__/ {
 }
 
 location /media/ {
-  alias __FINALPATH__/mediafiles/;
+  alias __INSTALL_DIR__/mediafiles/;
 }
 
 
diff --git a/conf/systemd.service b/conf/systemd.service
index a9372ed..61a2ebc 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -6,9 +6,9 @@ After=network.target
 Type=simple
 User=__APP__
 Group=__APP__
-WorkingDirectory=__FINALPATH__/
-EnvironmentFile=__FINALPATH__/.env
-ExecStart=__FINALPATH__/venv/bin/gunicorn --bind 127.0.0.1:__PORT__ recipes.wsgi:application
+WorkingDirectory=__INSTALL_DIR__/source/
+EnvironmentFile=__INSTALL_DIR__/.env
+ExecStart=__INSTALL_DIR__/venv/bin/gunicorn --bind 127.0.0.1:__PORT__ recipes.wsgi:application
 Restart=on-failure
 RestartSec=10
 
diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
deleted file mode 100644
index 421957b..0000000
--- a/doc/DISCLAIMER.md
+++ /dev/null
@@ -1,5 +0,0 @@
-* Known limitations:
-    * Requires a full dedicated domain for now
-
-* Specific Steps
-    * The first time the app is installed, you need to setup the initial super user. If you directly login with your YunoHost user's credentials, you will not be able to create the superuser from the web interface.
\ No newline at end of file
diff --git a/doc/POST_INSTALL b/doc/POST_INSTALL
new file mode 100644
index 0000000..fd253df
--- /dev/null
+++ b/doc/POST_INSTALL
@@ -0,0 +1,3 @@
+The first time the app is installed, you need to setup the initial super user.
+
+If you directly login with your YunoHost user's credentials, you will not be able to create the superuser from the web interface.
diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md
new file mode 100644
index 0000000..1ccfd5d
--- /dev/null
+++ b/doc/PRE_INSTALL.md
@@ -0,0 +1,3 @@
+### Known limitations:
+
+* Requires a full dedicated domain for now
diff --git a/manifest.json b/manifest.json
deleted file mode 100644
index 1fd1dc0..0000000
--- a/manifest.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "Tandoor",
-    "id": "tandoor",
-    "packaging_format": 1,
-    "description": {
-        "en": "Application for managing and sharing recipes, planning meals, building shopping lists and much much more!",
-        "fr": "Gérez et partagez vos recettes, planifiez vos repas, créez vos listes de courses et beaucoup plus encore !"
-    },
-    "version": "1.5.11~ynh1",
-    "url": "https://tandoor.dev",
-    "upstream": {
-        "license": "AGPL-3.0-or-later",
-        "website": "https://tandoor.dev",
-        "demo": "https://app.tandoor.dev/accounts/login/?demo",
-        "admindoc": "https://docs.tandoor.dev",
-        "userdoc": "https://docs.tandoor.dev",
-        "code": "https://github.com/TandoorRecipes/recipes"
-    },
-    "license": "AGPL-3.0-or-later",
-    "maintainer": {
-        "name": "Navan Chauhan",
-        "email": "tandoor@navan.email"
-    },
-    "requirements": {
-        "yunohost": ">= 11.2"
-    },
-    "multi_instance": true,
-    "services": [
-        "nginx"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-            {
-                "name": "is_public",
-                "type": "boolean",
-                "default": false,
-                "help": {
-                    "en": "Should the login be exposed to public?",
-                    "fr": "La connexion doit-elle être exposée au public ?"
-                }
-            }
-        ]
-    }
-}
diff --git a/manifest.toml b/manifest.toml
new file mode 100644
index 0000000..6342944
--- /dev/null
+++ b/manifest.toml
@@ -0,0 +1,100 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json
+
+packaging_format = 2
+
+id = "tandoor"
+name = "Tandoor"
+description.en = "Application for managing and sharing recipes, planning meals, building shopping lists and much much more!"
+description.fr = "Gérez et partagez vos recettes, planifiez vos repas, créez vos listes de courses et beaucoup plus encore !"
+
+version = "1.5.11~ynh2"
+
+maintainers = ["Navan Chauhan"]
+
+[upstream]
+license = "AGPL-3.0-or-later"
+website = "https://tandoor.dev"
+demo = "https://app.tandoor.dev/accounts/login/?demo"
+admindoc = "https://docs.tandoor.dev"
+userdoc = "https://docs.tandoor.dev"
+code = "https://github.com/TandoorRecipes/recipes"
+cpe = "cpe:2.3:a:tandoor:recipes"
+fund = "???"
+[integration]
+yunohost = ">= 11.2"
+architectures = "all"
+multi_instance = true
+ldap = false
+sso = false
+disk = "50M"
+ram.build = "50M"
+ram.runtime = "50M"
+
+[install]
+    [install.domain]
+    type = "domain"
+
+    [install.init_main_permission]
+    help.en = "Should the login be exposed to public?"
+    help.fr = "La connexion doit-elle être exposée au public ?"
+    type = "group"
+    default = false
+
+[resources]
+    [resources.sources.main]
+    url = "https://github.com/TandoorRecipes/recipes/archive/refs/tags/1.5.11.tar.gz"
+    sha256 = "deda304272a3a327eb24cd83dce61acfd86470a9bb885d31269ea01c6d1f9f14"
+    in_subdir = true
+
+    autoupdate.strategy = "latest_github_tag"
+    autoupdate.asset = "tarball"
+
+    [resources.system_user]
+
+    [resources.install_dir]
+
+    [resources.data_dir]
+
+    [resources.permissions]
+    main.url = "/"
+
+    [resources.ports]
+    main.default = 8095
+
+    [resources.apt]
+    packages = [
+        "git",
+        "curl",
+        "python3",
+        "python3-pip",
+        "python3-venv",
+        "libpq-dev",
+        "postgresql",
+        "libsasl2-dev",
+        "python3-dev",
+        "libldap2-dev",
+        "libssl-dev",
+        "libffi-dev",
+        "autoconf",
+        "build-essential",
+        # "tk-dev",
+        # "libncurses5-dev",
+        # "libncursesw5-dev",
+        # "libreadline6-dev",
+        # "libdb5.3-dev",
+        # "libgdbm-dev",
+        # "libsqlite3-dev",
+        # "libbz2-dev",
+        # "libexpat1-dev",
+        # "liblzma-dev",
+        # "wget",
+        # "tar",
+    ]
+
+    [resources.apt.extras.yarn]
+    repo = "deb https://dl.yarnpkg.com/debian/ stable main"
+    key = "https://dl.yarnpkg.com/debian/pubkey.gpg"
+    packages = ["yarn"]
+
+    [resources.database]
+    type = "postgresql"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 81163c5..5b214a9 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,99 +4,29 @@
 # COMMON VARIABLES
 #=================================================
 
-# dependencies used by the app (must be on a single line)
-pkg_dependencies="git curl python3 python3-pip python3-venv libpq-dev postgresql libsasl2-dev python3-dev libldap2-dev libssl-dev libffi-dev autoconf build-essential"
-
 nodejs_version=16
-py_required_version=3.9.2
 
 #=================================================
 # PERSONAL HELPERS
 #=================================================
 
-# Install specific python version
-# usage: myynh_install_python --python="3.8.6"
-# | arg: -p, --python=    - the python version to install
-myynh_install_python () {
-	# Declare an array to define the options of this helper.
-	local legacy_args=u
-	local -A args_array=( [p]=python= )
-	local python
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-	
-	# Check python version from APT
-	local py_apt_version=$(python3 --version | cut -d ' ' -f 2)
-	
-	# Check existing built version of python in /usr/local/bin
-	if [ -e "/usr/local/bin/python${python:0:3}" ]
-	then
-		local py_built_version=$(/usr/local/bin/python${python:0:3} --version \
-			| cut -d ' ' -f 2)
-	else
-		local py_built_version=0
-	fi
-	
-	# Compare version
-	if $(dpkg --compare-versions $py_apt_version ge $python)
-	then
-		# APT >= Required
-		ynh_print_info --message="Using provided python3..."
-		
-		py_app_version="python3"
-		
-	else
-		# Either python already built or to build 
-		if $(dpkg --compare-versions $py_built_version ge $python)
-		then
-			# Built >= Required
-			ynh_print_info --message="Using already used python3 built version..."
-			
-			py_app_version="/usr/local/bin/python${py_built_version:0:3}"
-			
-		else
-			ynh_print_info --message="Installing additional dependencies to build python..."
-			
-			pkg_dependencies="${pkg_dependencies} tk-dev libncurses5-dev libncursesw5-dev libreadline6-dev libdb5.3-dev libgdbm-dev libsqlite3-dev libbz2-dev libexpat1-dev liblzma-dev wget tar"
-			ynh_install_app_dependencies "${pkg_dependencies}"
-			
-			# APT < Minimal & Actual < Minimal => Build & install Python into /usr/local/bin
-			ynh_print_info --message="Building python (may take a while)..."
-			
-			# Store current direcotry 
-			local MY_DIR=$(pwd)
-			
-			# Create a temp direcotry
-			tmpdir="$(mktemp --directory)"
-			cd "$tmpdir"
-			
-			# Download
-			wget --output-document="Python-$python.tar.xz" \
-				"https://www.python.org/ftp/python/$python/Python-$python.tar.xz" 2>&1
-			
-			# Extract
-			tar xf "Python-$python.tar.xz"
-			
-			# Install
-			cd "Python-$python"
-			./configure --enable-optimizations
-			ynh_exec_warn_less make -j4
-			ynh_exec_warn_less make altinstall
-			
-			# Go back to working directory
-			cd "$MY_DIR"
-			
-			# Clean
-			ynh_secure_remove "$tmpdir"
-			
-			# Set version
-			py_app_version="/usr/local/bin/python${python:0:3}"
-		fi
-	fi
-	# Save python version in settings 
-	ynh_app_setting_set --app=$app --key=python --value="$python"
+_tandoor_venv_install() {
+    ynh_exec_as "$app" python3 -m venv --upgrade "$install_dir/venv"
+    venvpy="$install_dir/venv/bin/python3"
+
+    pushd "$install_dir/source"
+        ynh_exec_as "$app" "$venvpy" -m pip install -r requirements.txt
+    popd
 }
 
+_tandoor_build_frontend() {
+    pushd "$install_dir/source/vue"
+        ynh_use_nodejs
+        ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" yarn install
+        ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" yarn build
+    popd
+
+}
 
 #=================================================
 # EXPERIMENTAL HELPERS
@@ -105,3 +35,26 @@ myynh_install_python () {
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
+_mopidy_install() {
+    python3 -m venv --upgrade "$install_dir/venv"
+    chown -R "$app" "$install_dir"
+
+    venvpy="$install_dir/venv/bin/python3"
+
+    ynh_exec_as "$app" "$venvpy" -m pip install --upgrade --no-cache-dir pip
+
+    ynh_exec_as "$app" "$venvpy" -m pip install PyGObject
+
+    # install essential packages
+    ynh_exec_as "$app" "$venvpy" -m pip install --no-cache-dir \
+        Mopidy=="$(ynh_app_upstream_version)" \
+        Mopidy-local==3.2.1 \
+        Mopidy-MusicBox-Webclient==3.1.0 \
+        Mopidy-YouTube==3.7 \
+        Mopidy-YTMusic==0.3.8 \
+        Mopidy-RadioNet==0.2.2 \
+        Mopidy-Podcast==3.0.1 \
+        Mopidy-Podcast-iTunes==3.0.1 \
+        Mopidy-SoundCloud==3.0.2 \
+        Mopidy-MPD==3.3.0
+}
diff --git a/scripts/backup b/scripts/backup
index bfdef77..866f7ac 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -10,29 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	### Remove this function if there's nothing to clean before calling the remove script.
-	true
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_print_info --message="Loading installation settings..."
-
-app=$YNH_APP_INSTANCE_NAME
-
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-datadir=$(ynh_app_setting_get --app=$app --key=datadir)
-
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
@@ -42,33 +19,36 @@ ynh_print_info --message="Declaring files to be backed up..."
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup --src_path="$final_path"
+ynh_backup --src_path="$install_dir"
 
 #=================================================
 # BACKUP THE DATA DIR
 #=================================================
 
-ynh_backup --src_path="$datadir" --is_big
+ynh_backup --src_path="$data_dir" --is_big
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
+# Backup the nginx configuration
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP LOGROTATE
-#=================================================
+# Backup the systemd service unit
+ynh_backup --src_path="/etc/systemd/system/$app.service"
 
+# Backup the logrotate configuration
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
+# Backup the Fail2Ban config
+ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf"
+ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
+
 #=================================================
-# BACKUP SYSTEMD
+# BACKUP VARIOUS FILES
 #=================================================
 
-ynh_backup --src_path="/etc/systemd/system/$app.service"
+ynh_backup --src_path="/var/log/$app/"
 
 #=================================================
 # BACKUP THE PostgreSQL DATABASE
diff --git a/scripts/change_url b/scripts/change_url
index 495b7eb..9f0eec2 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -9,64 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# RETRIEVE ARGUMENTS
-#=================================================
-
-old_domain=$YNH_APP_OLD_DOMAIN
-old_path=$YNH_APP_OLD_PATH
-
-new_domain=$YNH_APP_NEW_DOMAIN
-new_path=$YNH_APP_NEW_PATH
-
-app=$YNH_APP_INSTANCE_NAME
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
-
-# Needed for helper "ynh_add_nginx_config"
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-
-# Add settings here as needed by your application
-#db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-#db_user=$db_name
-#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
-
-#=================================================
-# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
-	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-
-	# Restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# CHECK WHICH PARTS SHOULD BE CHANGED
-#=================================================
-
-change_domain=0
-if [ "$old_domain" != "$new_domain" ]
-then
-	change_domain=1
-fi
-
-change_path=0
-if [ "$old_path" != "$new_path" ]
-then
-	change_path=1
-fi
-
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
@@ -81,35 +23,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app
 #=================================================
 ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1
 
-nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
-
-# Change the path in the NGINX config file
-if [ $change_path -eq 1 ]
-then
-	# Make a backup of the original NGINX config file if modified
-	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-	# Set global variables for NGINX helper
-	domain="$old_domain"
-	path_url="$new_path"
-	# Create a dedicated NGINX config
-	ynh_add_nginx_config
-fi
-
-# Change the domain for NGINX
-if [ $change_domain -eq 1 ]
-then
-	# Delete file checksum for the old conf file location
-	ynh_delete_file_checksum --file="$nginx_conf_path"
-	mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
-	# Store file checksum for the new config file location
-	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-fi
-
-#=================================================
-# SPECIFIC MODIFICATIONS
-#=================================================
-# ...
-#=================================================
+ynh_change_url_nginx_config
 
 #=================================================
 # GENERIC FINALISATION
@@ -118,14 +32,7 @@ fi
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --time --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
+ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/install b/scripts/install
index b7795f8..712c499 100755
--- a/scripts/install
+++ b/scripts/install
@@ -10,238 +10,105 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# MANAGE SCRIPT FAILURE
+# INITIALIZE AND STORE SETTINGS
 #=================================================
 
-ynh_clean_setup () {
-	true
-}
-
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# RETRIEVE ARGUMENTS FROM THE MANIFEST
-#=================================================
-
-domain=$YNH_APP_ARG_DOMAIN
-path_url=/ #$YNH_APP_ARG_PATH
-is_public=$YNH_APP_ARG_IS_PUBLIC
-
-app=$YNH_APP_INSTANCE_NAME
-
 secretkey=$(ynh_string_random --length=12)
+ynh_app_setting_set --app=$app --key=secretkey --value="$secretkey"
+
 timezone="$(cat /etc/timezone)"
 
-#=================================================
-# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
-#=================================================
-ynh_script_progression --message="Validating installation parameters..." --weight=1
-
-### If the app uses NGINX as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app".
-### If the app provides an internal web server (or uses another application server such as uWSGI), the final path should be "/opt/yunohost/$app"
-final_path=/var/www/$app
-test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
-
-# Register (book) web path
-ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
-
-#=================================================
-# STORE SETTINGS FROM MANIFEST
-#=================================================
-ynh_script_progression --message="Storing installation settings..." --weight=1
-
-ynh_app_setting_set --app=$app --key=domain --value=$domain
-ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=secretkey --value=$secretkey
-
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-# FIND AND OPEN A PORT
-#=================================================
-ynh_script_progression --message="Finding an available port..." --weight=1
-
-# Find an available port
-port=$(ynh_find_port --port=8095)
-ynh_app_setting_set --app=$app --key=port --value=$port
-
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=3
+ynh_script_progression --message="Installing NodeJS..." --weight=3
 
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-
-# Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
-# Install Yarn
-ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..." --weight=1
-
-# Create a system user
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # CREATE A PostgreSQL DATABASE
 #=================================================
-ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1
+ynh_script_progression --message="Configuring a PostgreSQL database..." --weight=1
 
-db_name=$(ynh_sanitize_dbid --db_name=$app)
-db_user=$db_name
-ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-ynh_psql_test_if_first_run
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
-
-ynh_psql_execute_as_root --sql="GRANT ALL PRIVILEGES ON DATABASE $db_user TO $db_user;"
-ynh_psql_execute_as_root --sql="ALTER DATABASE $db_user OWNER TO $db_user;"
-ynh_psql_execute_as_root --sql="ALTER USER $db_user WITH SUPERUSER;"
+ynh_psql_execute_as_root --sql="GRANT ALL PRIVILEGES ON DATABASE $db_name TO $db_user;"
+ynh_psql_execute_as_root --sql="ALTER DATABASE $db_name OWNER TO $db_user;"
+ynh_psql_execute_as_root --sql="ALTER USER $db_name WITH SUPERUSER;"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=1
 
-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path"
+ynh_setup_source --dest_dir="$install_dir/source"
 
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
+chmod 750 "$install_dir"
+chmod -R o-rwx "$install_dir"
+chown -R "$app:www-data" "$install_dir"
 
-#=================================================
-# CREATE DATA DIRECTORY
-#=================================================
-ynh_script_progression --message="Creating a data directory..." --weight=1
-
-datadir=/home/yunohost.app/$app
-ynh_app_setting_set --app=$app --key=datadir --value=$datadir
-
-mkdir -p $datadir
-
-chmod 750 "$datadir"
-chmod -R o-rwx "$datadir"
-chown -R $app:www-data "$datadir"
-
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
+chmod 750 "$data_dir"
+chmod -R o-rwx "$data_dir"
+chown -R "$app:www-data" "$data_dir"
 
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template=".env.template" --destination="$final_path/.env"
+ynh_add_config --template=".env.template" --destination="$install_dir/.env"
 
-chmod 400 "$final_path/.env"
-chown $app:$app "$final_path/.env"
+chmod 400 "$install_dir/.env"
+chown "$app:$app" "$install_dir/.env"
 
 version=$(ynh_app_upstream_version)
 
-ynh_add_config --template="version.py" --destination="$final_path/recipes/version.py"
-chmod 400 "$final_path/recipes/version.py"
-chown $app:$app "$final_path/recipes/version.py"
+ynh_add_config --template="version.py" --destination="$install_dir/source/recipes/version.py"
+chmod 400 "$install_dir/source/recipes/version.py"
+chown "$app:$app" "$install_dir/source/recipes/version.py"
 
 #=================================================
 # SPECIFIC SETUP
 #=================================================
-ynh_script_progression --message="Setting up Tandoor venv..." --weight=1
-
-if [[ $(ynh_get_debian_release) == "bullseye" ]]; then
-	py_app_version="python3"
-else
-	myynh_install_python --python="$py_required_version"
-fi
-
-ynh_exec_as $app $py_app_version -m venv "$final_path/venv"
-
-ynh_script_progression --message="Installing dependencies via pip..." --weight=4
-pushd "$final_path"
-	ynh_exec_warn_less ynh_exec_as $app "$final_path/venv/bin/pip3" install -r requirements.txt
-popd
-
 ynh_script_progression --message="Building frontend..." --weight=5
-pushd "$final_path/vue"
-	ynh_use_nodejs
-	ynh_exec_warn_less yarn install
-	ynh_exec_warn_less yarn build
-popd
+_tandoor_build_frontend
+
+ynh_script_progression --message="Installing Tandoor and its python dependencies..." --weight=1
+_tandoor_venv_install
 
 ynh_script_progression --message="Running migrations and generating static files..." --weight=2
-pushd "$final_path"
-	# load environment variables
-	export $(cat "/var/www/$app/.env" |grep "^[^#]" | xargs)
-	ynh_exec_as $app "$final_path/venv/bin/python3" manage.py migrate
-	ynh_psql_execute_as_root --sql="ALTER USER $app WITH NOSUPERUSER;"
-	ynh_exec_as $app "$final_path/venv/bin/python3" manage.py collectstatic --no-input 
-	ynh_exec_as $app "$final_path/venv/bin/python3" manage.py collectstatic_js_reverse 
+pushd "$install_dir/source"
+    (
+        source "$install_dir/.env"
+
+        ynh_exec_as "$app" "$venvpy" manage.py migrate
+        ynh_psql_execute_as_root --sql="ALTER USER $app WITH NOSUPERUSER;"
+        ynh_exec_as "$app" "$venvpy" manage.py collectstatic --no-input
+        ynh_exec_as "$app" "$venvpy" manage.py collectstatic_js_reverse
+    )
 popd
 
 #=================================================
-# SETUP SYSTEMD
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=1
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
+# Create a dedicated systemd config
 ynh_add_systemd_config
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SETUP LOGROTATE
-#=================================================
-ynh_script_progression --message="Configuring log rotation..." --weight=1
+yunohost service add "$app" --description="Smart recipe management" --log="/var/log/$app/$app.log"
 
 # Use logrotate to manage application logfile(s)
 ynh_use_logrotate
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
-yunohost service add $app --description="Smart recipe management" --log="/var/log/$app/$app.log"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
-
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=1
-
-# Make app public if necessary
-if [ $is_public -eq 1 ]
-then
-	# Everyone can access the app.
-	# The "main" permission is automatically created before the install script.
-	ynh_permission_update --permission="main" --add="visitors"
-fi
-
-# Everyone can access the API part
-ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true"
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
+ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/remove b/scripts/remove
index ff4afaa..cf9d33a 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,111 +10,27 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-port=$(ynh_app_setting_get --app=$app --key=port)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-datadir=$(ynh_app_setting_get --app=$app --key=datadir)
-
-#=================================================
-# STANDARD REMOVE
-#=================================================
-# REMOVE SERVICE INTEGRATION IN YUNOHOST
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
-if ynh_exec_warn_less yunohost service status $app >/dev/null
-then
-	ynh_script_progression --message="Removing $app service integration..." --weight=1
-	yunohost service remove $app
+if ynh_exec_warn_less yunohost service status $app >/dev/null; then
+    yunohost service remove $app
 fi
 
-#=================================================
-# STOP AND REMOVE SERVICE
-#=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
-
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 
-#=================================================
-# REMOVE LOGROTATE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing logrotate configuration..." --weight=1
+# Remove the dedicated NGINX config
+ynh_remove_nginx_config
 
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-#=================================================
-# REMOVE THE PostgreSQL DATABASE
-#=================================================
-ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1
-
-# Remove a database if it exists, along with the associated user
-ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
-
-#=================================================
-# REMOVE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Removing app main directory..." --weight=1
-
-# Remove the app directory securely
-ynh_secure_remove --file="$final_path"
-
-#=================================================
-# REMOVE DATA DIR
-#=================================================
-
-# Remove the data directory if --purge option is used
-if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
-then
-	ynh_script_progression --message="Removing app data directory..." --weight=1
-	ynh_secure_remove --file="$datadir"
-fi
-
-#=================================================
-# REMOVE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
-
-# Remove the dedicated NGINX config
-ynh_remove_nginx_config
-
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
-
-# Remove metapackage and its dependencies
-ynh_remove_app_dependencies
-
-#=================================================
-# SPECIFIC REMOVE
-#=================================================
-# REMOVE VARIOUS FILES
-#=================================================
-ynh_script_progression --message="Removing various files..." --weight=1
-
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# REMOVE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --weight=1
-
-# Delete a system user
-ynh_system_user_delete --username=$app
-
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 4613e48..1ed1148 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -10,143 +10,62 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	#### Remove this function if there's nothing to clean before calling the remove script.
-	true
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-port=$(ynh_app_setting_get --app=$app --key=port)
-path_url=$(ynh_app_setting_get --app=$app --key=path)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
-secretkey=$(ynh_app_setting_get --app=$app --key=secretkey)
-datadir=$(ynh_app_setting_get --app=$app --key=datadir)
-
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
-ynh_script_progression --message="Validating restoration parameters..." --weight=1
-
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
-
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RECREATE THE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
-
-# Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
 ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
-ynh_restore_file --origin_path="$final_path"
+ynh_restore_file --origin_path="$install_dir"
 
-# FIXME: this should be managed by the core in the future
-# Here, as a packager, you may have to tweak the ownerhsip/permissions
-# such that the appropriate users (e.g. maybe www-data) can access
-# files in some cases.
-# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder -
-# this will be treated as a security issue.
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
+chmod 750 "$install_dir"
+chmod -R o-rwx "$install_dir"
+chown -R "$app:www-data" "$install_dir"
 
 #=================================================
 # RESTORE THE DATA DIRECTORY
 #=================================================
 ynh_script_progression --message="Restoring the data directory..." --weight=1
 
-ynh_restore_file --origin_path="$datadir" --not_mandatory
+ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
-mkdir -p $datadir
-
-chmod 750 "$datadir"
-chmod -R o-rwx "$datadir"
-chown -R $app:www-data "$datadir"
-
-#=================================================
-# SPECIFIC RESTORATION
-#=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=1
-
-# Define and install dependencies
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+chmod 750 "$data_dir"
+chmod -R o-rwx "$data_dir"
+chown -R "$app:www-data" "$data_dir"
 
 #=================================================
 # RESTORE THE PostgreSQL DATABASE
 #=================================================
 ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1
 
-ynh_psql_test_if_first_run
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
-ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
+ynh_psql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql
 
 #=================================================
-# RESTORE SYSTEMD
+# RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
+
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
-systemctl enable $app.service --quiet
-
-#=================================================
-# RESTORE THE LOGROTATE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1
+systemctl enable "$app.service" --quiet
+yunohost service add "$app" --description="Smart recipe management" --log="/var/log/$app/$app.log"
 
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
 #=================================================
-# INTEGRATE SERVICE IN YUNOHOST
+# RESTORE VARIOUS FILES
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Smart recipe management" --log="/var/log/$app/$app.log"
-
-#=================================================
-# START SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
-
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_restore_file --origin_path="/var/log/$app/"
 
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
-# RELOAD NGINX
+# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
+ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
+
+ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log"
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/upgrade b/scripts/upgrade
index fcd321d..32747ca 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,44 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-port=$(ynh_app_setting_get --app=$app --key=port)
-path_url=$(ynh_app_setting_get --app=$app --key=path)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-datadir=$(ynh_app_setting_get --app=$app --key=datadir)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
-secretkey=$(ynh_app_setting_get --app=$app --key=secretkey)
-timezone="$(cat /etc/timezone)"
-
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# Restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -54,126 +16,85 @@ ynh_abort_if_errors
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
-#=================================================
-# DOWNLOAD, CHECK AND UNPACK SOURCE
+# INITIALIZE AND STORE SETTINGS
 #=================================================
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="venv mediafiles"
-
-	chmod 750 "$final_path"
-	chmod -R o-rwx "$final_path"
-	chown -R $app:www-data "$final_path"
-fi
+timezone="$(cat /etc/timezone)"
 
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=1
+ynh_script_progression --message="Updating NodeJS..." --weight=1
 
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-
-# Install Nodejs
-ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
-
-# Install Yarn
-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_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version"
 
 #=================================================
-# NGINX CONFIGURATION
+# DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-# Create a dedicated NGINX config
-ynh_add_nginx_config
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir/source" --full_replace=1
+
+chmod 750 "$install_dir"
+chmod -R o-rwx "$install_dir"
+chown -R "$app:www-data" "$install_dir"
 
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
 ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-ynh_add_config --template=".env.template" --destination="$final_path/.env"
+ynh_add_config --template=".env.template" --destination="$install_dir/.env"
 
-# FIXME: this should be handled by the core in the future
-# You may need to use chmod 600 instead of 400,
-# for example if the app is expected to be able to modify its own config
-chmod 400 "$final_path/.env"
-chown $app:$app "$final_path/.env"
+chmod 400 "$install_dir/.env"
+chown "$app:$app" "$install_dir/.env"
 
 version=$(ynh_app_upstream_version)
 
-ynh_add_config --template="version.py" --destination="$final_path/recipes/version.py"
-chmod 400 "$final_path/recipes/version.py"
-chown $app:$app "$final_path/recipes/version.py"
+ynh_add_config --template="version.py" --destination="$install_dir/source/recipes/version.py"
+chmod 400 "$install_dir/source/recipes/version.py"
+chown "$app:$app" "$install_dir/source/recipes/version.py"
 
 #=================================================
-# SPECIFIC UPGRADE
+# SPECIFIC SETUP
 #=================================================
+ynh_script_progression --message="Building frontend..." --weight=5
+_tandoor_build_frontend
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
+ynh_script_progression --message="Installing Tandoor and its python dependencies..." --weight=1
+_tandoor_venv_install
 
-	ynh_script_progression --message="Upgrading dependencies via pip..." --weight=4
-	pushd "$final_path"
-		ynh_exec_warn_less ynh_exec_as $app "$final_path/venv/bin/pip3" install -r requirements.txt
-	popd
+ynh_script_progression --message="Running migrations and generating static files..." --weight=2
+pushd "$install_dir/source"
+    (
+        source "$install_dir/.env"
 
-	ynh_script_progression --message="Running migrations and generatic static files..." --weight=2
-	pushd "$final_path"
-		# load environment variables
-		export $(cat "/var/www/$app/.env" |grep "^[^#]" | xargs)
-		ynh_exec_as $app "$final_path/venv/bin/python3" manage.py migrate
-		ynh_exec_as $app "$final_path/venv/bin/python3" manage.py collectstatic --no-input 
-		ynh_exec_as $app "$final_path/venv/bin/python3" manage.py collectstatic_js_reverse 
-	popd
-
-	ynh_script_progression --message="Building frontend..." --weight=5
-	pushd "$final_path/vue"
-		ynh_use_nodejs
-		yarn install
-		yarn build
-	popd
-fi
+        ynh_exec_as "$app" "$venvpy" manage.py migrate
+        ynh_psql_execute_as_root --sql="ALTER USER $app WITH NOSUPERUSER;"
+        ynh_exec_as "$app" "$venvpy" manage.py collectstatic --no-input
+        ynh_exec_as "$app" "$venvpy" manage.py collectstatic_js_reverse
+    )
+popd
 
 #=================================================
-# SETUP SYSTEMD
+# REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
 
 # Create a dedicated systemd config
 ynh_add_systemd_config
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SETUP LOGROTATE
-#=================================================
-ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1
+yunohost service add "$app" --description="Smart recipe management" --log="/var/log/$app/$app.log"
 
 # Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --non-append
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
-yunohost service add $app --description="Smart recipe management" --log="/var/log/$app/$app.log"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
@@ -181,13 +102,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/tests.toml b/tests.toml
new file mode 100644
index 0000000..bea71d5
--- /dev/null
+++ b/tests.toml
@@ -0,0 +1,11 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json
+
+test_format = 1.0
+
+[default]
+
+    # ------------
+    # Tests to run
+    # ------------
+
+    test_upgrade_from.295b9edb6d9c6f0a39cd8b9a8ad8dc38904199bd.name = "Latest packagingv1 version"