diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
deleted file mode 100644
index a0f5bdd..0000000
--- a/.github/workflows/updater.sh
+++ /dev/null
@@ -1,97 +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)
-asset_url=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select(.tag_name=="'$version'").tarball_url')
-
-# 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
-
-#=================================================
-# UPDATE SOURCE FILES
-#=================================================
-
-echo "Handling asset at $asset_url"
-
-src="app"
-
-# 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
-
-# Rewrite source file
-cat <<EOT > conf/$src.src
-SOURCE_URL=$asset_url
-SOURCE_SUM=$checksum
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true
-EOT
-echo "... conf/$src.src updated"
-
-#=================================================
-# 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 a56d7cb..0000000
--- a/.github/workflows/updater.yml
+++ /dev/null
@@ -1,49 +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@v3
-        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@v4
-        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 }}
-          draft: false
diff --git a/README.md b/README.md
index cbe74fa..7b22208 100644
--- a/README.md
+++ b/README.md
@@ -26,18 +26,6 @@ Dendrite is a second-generation Matrix homeserver written in Go. It intends to p
 
 
 **Shipped version:** 0.12.0~ynh1
-## Disclaimers / important information
-
-:warning: The upstream app is still in beta. Tread carefully.
-
-## Features
-
-* Registration can be opened in the app config panel.
-
-## Limitations
-
-* Dendrite does not implement secondary user registration schemes yet, so YunoHost users cannot be integrated at the moment.
-
 ## :red_circle: Antifeatures
 
 - **Alpha software**: Early development stage. May contain changing or unstable features, bugs, and security vulnerability.
diff --git a/README_fr.md b/README_fr.md
index f2b43c3..96a92da 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -16,28 +16,16 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 ## Vue d’ensemble
 
-Dendrite is a second-generation Matrix homeserver written in Go. It intends to provide an efficient, reliable and scalable alternative to Synapse:
+Dendrite est un serveur domestique Matrix de deuxième génération écrit en Go. Il entend fournir une alternative efficace, fiable et évolutive à Synapse :
 
-### Features
+### Caractéristiques
 
-- Efficient: A small memory footprint with better baseline performance than an out-of-the-box Synapse.
-- Reliable: Implements the Matrix specification as written, using the same test suite as Synapse as well as a brand new Go test suite.
-- Scalable: can run on multiple machines and eventually scale to massive homeserver deployments.
+- Efficace : une petite empreinte mémoire avec de meilleures performances de base qu'un Synapse prêt à l'emploi.
+- Fiable : implémente la spécification Matrix telle qu'écrite, en utilisant la même suite de tests que Synapse ainsi qu'une toute nouvelle suite de tests Go.
+- Évolutif : peut fonctionner sur plusieurs machines et éventuellement évoluer vers des déploiements massifs de serveurs domestiques.
 
 
 **Version incluse :** 0.12.0~ynh1
-## Avertissements / informations importantes
-
-:warning: The upstream app is still in beta. Tread carefully.
-
-## Features
-
-* Registration can be opened in the app config panel.
-
-## Limitations
-
-* Dendrite does not implement secondary user registration schemes yet, so YunoHost users cannot be integrated at the moment.
-
 ## :red_circle: Fonctions indésirables
 
 - **Alpha software**: Early development stage. May contain changing or unstable features, bugs, and security vulnerability.
diff --git a/check_process b/check_process
deleted file mode 100644
index 68cc371..0000000
--- a/check_process
+++ /dev/null
@@ -1,23 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		server_name="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
-		# 0.9.9~ynh1
-		upgrade=1	from_commit=15f4690bafea6454b1777a00658f9839e7ea77c0
-		backup_restore=1
-		multi_instance=0
-		port_already_use=0
-		change_url=1
-;;; Options
-Email=
-Notification=none
diff --git a/conf/app.src b/conf/app.src
deleted file mode 100644
index e2c182d..0000000
--- a/conf/app.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://api.github.com/repos/matrix-org/dendrite/tarball/v0.12.0
-SOURCE_SUM=a50fba39dbbfe4de58674e448e7d1149359759f526bd366c3976547d9744953c
-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 5757cd1..3abe974 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -5,7 +5,7 @@ location ~ ^/$ {
 }
 
 location /_matrix {
-  proxy_pass http://localhost:__PORT__;
+  proxy_pass http://127.0.0.1:__PORT__;
   proxy_set_header X-Real-IP  $remote_addr;
   proxy_set_header Host  $host;
   proxy_read_timeout 600;
diff --git a/conf/server_name.conf b/conf/server_name.conf
index e03481c..aff0065 100644
--- a/conf/server_name.conf
+++ b/conf/server_name.conf
@@ -1,5 +1,5 @@
 location /.well-known/matrix/server {
-    return 200 '{"m.server": "__DOMAIN__:__TLS_PORT__"}';
+    return 200 '{"m.server": "__DOMAIN__:__PORT_TLS__"}';
     add_header Content-Type application/json;
     add_header Access-Control-Allow-Origin '*';
 }
diff --git a/conf/systemd.service b/conf/systemd.service
index b8a6b41..01d3301 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -6,8 +6,8 @@ After=network.target postgresql@__PSQL_VERSION__-main.service
 Type=simple
 User=__APP__
 Group=__APP__
-WorkingDirectory=__FINALPATH__/
-ExecStart=__FINALPATH__/bin/dendrite --tls-cert=/etc/yunohost/certs/__DOMAIN__/crt.pem --tls-key=/etc/yunohost/certs/__DOMAIN__/key.pem --config=dendrite.yaml --http-bind-address=:__PORT__ --https-bind-address=:__TLS_PORT__ __REALLY_ENABLE_OPEN_REGISTRATION__
+WorkingDirectory=__INSTALL_DIR__/
+ExecStart=__INSTALL_DIR__/bin/dendrite --tls-cert=/etc/yunohost/certs/__DOMAIN__/crt.pem --tls-key=/etc/yunohost/certs/__DOMAIN__/key.pem --config=dendrite.yaml --http-bind-address=:__PORT__ --https-bind-address=:__PORT_TLS__ __REALLY_ENABLE_OPEN_REGISTRATION__
 StandardOutput=journal
 StandardError=inherit
 LimitNOFILE=65535
diff --git a/doc/DISCLAIMER.md b/doc/ADMIN.md
similarity index 100%
rename from doc/DISCLAIMER.md
rename to doc/ADMIN.md
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
new file mode 100644
index 0000000..0a6bfe8
--- /dev/null
+++ b/doc/ADMIN_fr.md
@@ -0,0 +1,9 @@
+:warning: The upstream app is still in beta. Tread carefully.
+
+## Features
+
+* Registration can be opened in the app config panel.
+
+## Limitations
+
+* Dendrite does not implement secondary user registration schemes yet, so YunoHost users cannot be integrated at the moment.
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
new file mode 100644
index 0000000..52f313c
--- /dev/null
+++ b/doc/DESCRIPTION_fr.md
@@ -0,0 +1,7 @@
+Dendrite est un serveur domestique Matrix de deuxième génération écrit en Go. Il entend fournir une alternative efficace, fiable et évolutive à Synapse :
+
+### Caractéristiques
+
+- Efficace : une petite empreinte mémoire avec de meilleures performances de base qu'un Synapse prêt à l'emploi.
+- Fiable : implémente la spécification Matrix telle qu'écrite, en utilisant la même suite de tests que Synapse ainsi qu'une toute nouvelle suite de tests Go.
+- Évolutif : peut fonctionner sur plusieurs machines et éventuellement évoluer vers des déploiements massifs de serveurs domestiques.
diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md
new file mode 100644
index 0000000..7256b95
--- /dev/null
+++ b/doc/PRE_INSTALL.md
@@ -0,0 +1,3 @@
+Dendrite is still in beta phase.
+It is functional, but all Matrix features are yet to be implemented.
+See the upstream repo for more information: https://github.com/matrix-org/dendrite\n\nThis package est encore en development, all features from Matrix/Synapse are yet to be implemented."
diff --git a/doc/PRE_INSTALL_fr.md b/doc/PRE_INSTALL_fr.md
new file mode 100644
index 0000000..f4070da
--- /dev/null
+++ b/doc/PRE_INSTALL_fr.md
@@ -0,0 +1,3 @@
+   Dendrite est encore en phase bêta.
+   Cette application est fonctionnelle, mais n'implémente pas encore toutes les fonctionnalités de Matrix.
+   Consultez le dépôt source pour plus d'information : https://github.com/matrix-org/dendrite\n\nCe package est encore en développement, toutes les fonctionalités de Matrix/Synapse ne sont pas encore implémentées.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
deleted file mode 100644
index e36662b..0000000
--- a/manifest.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "name": "Dendrite",
-    "id": "dendrite",
-    "packaging_format": 1,
-    "description": {
-        "en": "Matrix homeserver of second generation",
-        "fr": "Serveur Matrix de seconde génération"
-    },
-    "version": "0.12.0~ynh1",
-    "url": "https://matrix.org/",
-    "upstream": {
-        "license": "Apache-2.0",
-        "website": "https://matrix.org/",
-        "admindoc": "https://github.com/matrix-org/dendrite/tree/master/docs",
-        "code": "https://github.com/matrix-org/dendrite"
-    },
-    "license": "Apache-2.0",
-    "maintainer": {
-        "name": "tituspijean",
-        "email": "tituspijean@outlook.com"
-    },
-    "requirements": {
-        "yunohost": ">= 4.3.0"
-    },
-    "multi_instance": false,
-    "services": [
-        "nginx"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "warning",
-                "type": "display_text",
-                "ask": {
-                    "en": "Dendrite is still in beta phase.\nIt is functional, but all Matrix features are yet to be implemented.\nSee the upstream repo for more information: https://github.com/matrix-org/dendrite\n\nThis package est encore en development, all features from Matrix/Synapse are yet to be implemented.",
-                    "fr": "Dendrite est encore en phase bêta.\nElle est fonctionnelle, mais n'implémente pas encore toutes les fonctionnalités de Matrix.\nConsultez le dépôt source pour plus d'information : https://github.com/matrix-org/dendrite\n\nCe package est encore en développement, toutes les fonctionalités de Matrix/Synapse ne sont pas encore implémentées."
-                }
-            },
-            {
-                "name": "domain",
-                "type": "domain",
-                "help": {
-                    "en": "Select the domain onto which Dendrite will be exclusively installed, e.g. dendrite.domain.tld",
-                    "fr": "Sélectionnez le domaine exclusivement dédié à Dendrite, par exemple dendrite.domain.tld"
-                }
-            },
-            {
-                "name": "server_name",
-                "type": "domain",
-                "ask": {
-                    "en": "Select the display name for your Dendrite server",
-                    "fr": "Sélectionnez le nom d'affichage pour votre serveur Dendrite"
-                },
-                "help": {
-                    "en": "If you choose domain.tld, your Matrix user-ids will be looking like @user:domain.tld instead of @user:dendrite.domain.tld",
-                    "fr": "Si vous choisissez domain.tld, vos identifiants Matrix ressembleront à @utilisateur:domain.tld plutôt que @utilisateur:dendrite.domain.tld"
-                }
-            },
-            {
-                "name": "registration",
-                "type": "boolean",
-                "default": false,
-                "ask": {
-                    "en": "Should the server allow any visitor to register as a user?",
-                    "fr": "Le serveur doit-il permettre à quiconque de s'enregistrer comme utilisateur ?"
-                }
-            }
-        ]
-    }
-}
diff --git a/manifest.toml b/manifest.toml
new file mode 100644
index 0000000..f50f4ae
--- /dev/null
+++ b/manifest.toml
@@ -0,0 +1,86 @@
+packaging_format = 2
+
+id = "dendrite"
+name = "Dendrite"
+description.en = "Matrix homeserver of second generation"
+description.fr = "Serveur Matrix de seconde génération"
+
+version = "0.12.0~ynh1"
+
+maintainers = ["tituspijean"]
+
+[upstream]
+license = "Apache-2.0"
+website = "https://matrix.org/"
+admindoc = "https://github.com/matrix-org/dendrite/tree/master/docs"
+code = "https://github.com/matrix-org/dendrite"
+
+[integration]
+yunohost = ">= 11.1.17"
+architectures = "all"
+multi_instance = false
+ldap = "not_relevant"
+sso = "not_relevant"
+disk = "50M"
+ram.build = "50M"
+ram.runtime = "50M"
+
+[install]
+
+    [install.domain]
+    help.en = "Select the domain onto which Dendrite will be exclusively installed, e.g. dendrite.domain.tld"
+    help.fr = "Sélectionnez le domaine exclusivement dédié à Dendrite, par exemple dendrite.domain.tld"
+    type = "domain"
+    full_domain = true
+
+    [install.server_name]
+    ask.en = "Select the display name for your Dendrite server"
+    ask.fr = "Sélectionnez le nom d'affichage pour votre serveur Dendrite"
+    help.en = "If you choose domain.tld, your Matrix user-ids will be looking like @user:domain.tld instead of @user:dendrite.domain.tld"
+    help.fr = "Si vous choisissez domain.tld, vos identifiants Matrix ressembleront à @utilisateur:domain.tld plutôt que @utilisateur:dendrite.domain.tld"
+    type = "domain"
+
+    [install.registration]
+    ask.en = "Should the server allow any visitor to register as a user?"
+    ask.fr = "Le serveur doit-il permettre à quiconque de s'enregistrer comme utilisateur ?"
+    type = "boolean"
+    default = false
+
+[resources]
+        [resources.sources.main]
+        url = "https://api.github.com/repos/matrix-org/dendrite/tarball/v0.12.0"
+        sha256 = "a50fba39dbbfe4de58674e448e7d1149359759f526bd366c3976547d9744953c"
+        autoupdate.strategy = "latest_github_tag"
+
+    [resources.ports]
+    main.default = 8008
+    tls.default = 8448
+    tls.exposed = "TCP"
+
+    [resources.system_user]
+
+    [resources.install_dir]
+    dir = "/opt/yunohost/__APP__"
+
+    [resources.permissions]
+    main.url = "/"
+    main.show_tile = false
+    server_api.url = "__DOMAIN__/_matrix"
+    server_api.label = "Server access for client apps."
+    server_api.show_tile = false
+    server_api.allowed = "visitors"
+    server_api.auth_header = false
+    server_api.protected = true
+
+    server_client_infos.url = "__SERVER_NAME__/.well-known/matrix"
+    server_client_infos.label = "Server info for clients. (well-known)"
+    server_client_infos.show_tile = false
+    server_client_infos.allowed = "visitors"
+    server_client_infos.auth_header = false
+    server_client_infos.protected = true
+
+    [resources.apt]
+    packages = "postgresql"
+
+    [resources.database]
+    type = "postgresql"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 00211e0..f52b267 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,9 +4,6 @@
 # COMMON VARIABLES
 #=================================================
 
-# dependencies used by the app (must be on a single line)
-pkg_dependencies="postgresql postgresql-contrib"
-
 GO_VERSION="1.20"
 psql_version=$PSQL_VERSION
 
diff --git a/scripts/backup b/scripts/backup
index ca96846..4cd0f6d 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -10,28 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	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)
-server_name=$(ynh_app_setting_get --app=$app --key=server_name)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
@@ -41,7 +19,7 @@ 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 NGINX CONFIGURATION
diff --git a/scripts/change_url b/scripts/change_url
index cbd458f..97656f1 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -10,32 +10,12 @@ source _common.sh
 source ynh_install_go
 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..." --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
 domain=$YNH_APP_NEW_DOMAIN
-server_name=$(ynh_app_setting_get --app=$app --key=server_name)
-port=$(ynh_app_setting_get --app=$app --key=port)
-tls_port=$(ynh_app_setting_get --app=$app --key=tls_port)
-registration=$(ynh_app_setting_get --app=$app --key=registration)
 
 # Load up registration variables
 if [[ $registration -eq 1 ]]
@@ -47,41 +27,6 @@ else
         really_enable_open_registration=""
 fi
 
-#=================================================
-# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	ynh_clean_check_starting
-	# 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
-	ynh_die --message "The new URL needs to be at the root of a domain."
-fi
-
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
@@ -96,29 +41,7 @@ ynh_systemd_action --service_name=$app --action="stop" --line_match="Dendrite is
 #=================================================
 ynh_script_progression --message="Updating NGINX web server configuration..." --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
+ynh_change_url_nginx_config
 
 #=================================================
 # SPECIFIC MODIFICATIONS
@@ -140,13 +63,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action="start" --line_match="Cleaning old notifications" --log_path="systemd"
 
-#=================================================
-# 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/scripts/config b/scripts/config
index fac0561..cc18266 100644
--- a/scripts/config
+++ b/scripts/config
@@ -9,23 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-ynh_abort_if_errors
-
-#=================================================
-# RETRIEVE ARGUMENTS
-#=================================================
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-server_name=$(ynh_app_setting_get --app=$app --key=server_name)
-path_url=$(ynh_app_setting_get --app=$app --key=path)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-port=$(ynh_app_setting_get --app=$app --key=port)
-tls_port=$(ynh_app_setting_get --app=$app --key=tls_port)
-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)
-#registration is not loaded since it's set up by the config panel
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
@@ -44,9 +27,9 @@ ynh_app_config_apply() {
             really_enable_open_registration=""
         fi
 
-        ynh_add_config --template="../conf/dendrite.yaml" --destination="$final_path/dendrite.yaml"
+        ynh_add_config --template="../conf/dendrite.yaml" --destination="$install_dir/dendrite.yaml"
         ynh_add_systemd_config
-        ynh_systemd_action --service_name=$app --action="restart" --line_match="Cleaning old notifications" --log_path="systemd"
+        ynh_systemd_action --service_name=$app --action="restart" --line_match="Starting external listener" --log_path="systemd"
         ynh_app_setting_set --app=$app --key=registration --value=$registration
 
     fi
diff --git a/scripts/install b/scripts/install
index 1d6c471..fb8aaac 100644
--- a/scripts/install
+++ b/scripts/install
@@ -10,27 +10,10 @@ source _common.sh
 source ynh_install_go
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-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="/"
-server_name=$YNH_APP_ARG_SERVER_NAME
-registration=$YNH_APP_ARG_REGISTRATION
-
-app=$YNH_APP_INSTANCE_NAME
-
 # Allow or deny registration based on is_public
 if [ $registration -eq 1 ]
 then
@@ -41,68 +24,24 @@ else
 	really_enable_open_registration=""
 fi
 
-#=================================================
-# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
-#=================================================
-ynh_script_progression --message="Validating installation parameters..." --weight=1
-
-final_path=/opt/yunohost/$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=server_name --value=$server_name
 ynh_app_setting_set --app=$app --key=registration --value=$registration
 
 #=================================================
-# STANDARD MODIFICATIONS
+# ADD USER TO THE SSL-CERT GROUP
 #=================================================
-# FIND AND OPEN A PORT
-#=================================================
-ynh_script_progression --message="Configuring firewall..." --weight=1
 
-# Find available ports
-port=$(ynh_find_port --port=8008)
-ynh_app_setting_set --app=$app --key=port --value=$port
-tls_port=$(ynh_find_port --port=8448)
-ynh_app_setting_set --app=$app --key=tls_port --value=$tls_port
-
-# Open TLS port
-ynh_exec_warn_less yunohost firewall allow TCP $tls_port
-
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=3
-
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-
-#=================================================
-# 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" --groups="ssl-cert"
+usermod -a -G ssl-cert $app
 
 #=================================================
 # CREATE A POSTGRESQL DATABASE
 #=================================================
 ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2
 
-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="CREATE DATABASE $db_name ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER $app;"
 
 #=================================================
@@ -110,13 +49,11 @@ ynh_psql_execute_as_root --sql="CREATE DATABASE $db_name ENCODING 'UTF8' LC_COLL
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=2
 
-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/build"
+ynh_setup_source --dest_dir="$install_dir/build"
 
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:root "$final_path"
+chmod -R o-rwx "$install_dir"
+chown -R $app:root "$install_dir"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -141,22 +78,22 @@ ynh_script_progression --message="Building the sources (it will take some time).
 
 ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION
 
-pushd "$final_path/build"
+pushd "$install_dir/build"
 	# Build the sources
 	ynh_use_go
-	export GOPATH="$final_path/build/go"
-	export GOCACHE="$final_path/build/.cache"
-	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/dendrite > /dev/null 2>&1
-	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/create-account > /dev/null 2>&1
-	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/generate-keys > /dev/null 2>&1
+	export GOPATH="$install_dir/build/go"
+	export GOCACHE="$install_dir/build/.cache"
+	CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/dendrite > /dev/null 2>&1
+	CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/create-account > /dev/null 2>&1
+	CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/generate-keys > /dev/null 2>&1
 popd
 
-ynh_secure_remove --file="$final_path/build"
+ynh_secure_remove --file="$install_dir/build"
 ynh_remove_go
 
 ynh_script_progression --message="Generating the keys..." --weight=1
 
-pushd "$final_path"
+pushd "$install_dir"
 	# Generate a Matrix signing key for federation
 	./bin/generate-keys --private-key matrix_key.pem
 	# Generate a self-signed certificate
@@ -164,7 +101,7 @@ pushd "$final_path"
 popd
 
 # Set permissions to app files
-chown -R $app:root "$final_path"
+chown -R $app:root "$install_dir"
 
 #=================================================
 # ADD A CONFIGURATION
@@ -172,10 +109,10 @@ chown -R $app:root "$final_path"
 ynh_script_progression --message="Adding a configuration file..."
 
 # Copy and modify the config file
-ynh_add_config --template="../conf/dendrite.yaml" --destination="$final_path/dendrite.yaml"
+ynh_add_config --template="../conf/dendrite.yaml" --destination="$install_dir/dendrite.yaml"
 
-chmod 400 "$final_path/dendrite.yaml"
-chown $app:$app "$final_path/dendrite.yaml"
+chmod 400 "$install_dir/dendrite.yaml"
+chown $app:$app "$install_dir/dendrite.yaml"
 
 #=================================================
 # SETUP SYSTEMD
@@ -206,7 +143,7 @@ ynh_replace_string --match_string="/var/log/$app/*.log" --replace_string="/var/l
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var/log/$app/$app.log" --needs_exposed_ports "$tls_port"
+yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var/log/$app/$app.log" --needs_exposed_ports "$port_tls"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -214,30 +151,7 @@ yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --line_match="Cleaning old notifications" --log_path="systemd"
-
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=1
-
-ynh_permission_update --permission=main --show_tile=false
-
-ynh_permission_create --permission=server_api --url=$domain/_matrix \
-                      --label="Server access for client apps." --show_tile=false --allowed=visitors \
-                      --auth_header=false --protected=true
-if yunohost --output-as plain domain list | grep -q "^$server_name$"; then
-    ynh_permission_create --permission=server_client_infos --url=$server_name/.well-known/matrix \
-                          --label="Server info for clients. (well-known)" --show_tile=false --allowed=visitors \
-                          --auth_header=false --protected=true
-fi
-
-#=================================================
-# 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" --line_match="Starting external listener" --log_path="systemd"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/remove b/scripts/remove
index e54a08c..2850c89 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -9,21 +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)
-tls_port=$(ynh_app_setting_get --app=$app --key=tls_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)
-server_name=$(ynh_app_setting_get --app=$app --key=server_name)
-
 #=================================================
 # STANDARD REMOVE
 #=================================================
@@ -53,22 +38,6 @@ ynh_script_progression --message="Removing logrotate configuration..." --weight=
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-#=================================================
-# REMOVE THE POSTGRESQL DATABASE
-#=================================================
-ynh_script_progression --message="Removing the PostgreSQL database..." --weight=2
-
-# 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 NGINX CONFIGURATION
 #=================================================
@@ -80,24 +49,6 @@ ynh_secure_remove --file="/etc/nginx/conf.d/${server_name}.d/${app}_server_name.
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=3
-
-# Remove metapackage and its dependencies
-ynh_remove_app_dependencies
-
-#=================================================
-# CLOSE A PORT
-#=================================================
-
-if yunohost firewall list | grep -q "\- $tls_port$"
-then
-	ynh_script_progression --message="Closing port $tls_port..." --weight=1
-	ynh_exec_warn_less yunohost firewall disallow TCP $tls_port
-fi
-
 #=================================================
 # SPECIFIC REMOVE
 #=================================================
@@ -107,16 +58,6 @@ fi
 # 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 55b83f7..e98d9b4 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -10,78 +10,15 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	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)
-server_name=$(ynh_app_setting_get --app=$app --key=server_name)
-path_url=$(ynh_app_setting_get --app=$app --key=path)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-port=$(ynh_app_setting_get --app=$app --key=port)
-tls_port=$(ynh_app_setting_get --app=$app --key=tls_port)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-
-#=================================================
-# 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" --groups="ssl-cert"
-
 #=================================================
 # 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"
 
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:root "$final_path"
-
-#=================================================
-# SPECIFIC RESTORATION
-#=================================================
-# FIND AND OPEN A PORT
-#=================================================
-ynh_script_progression --message="Configuring firewall..." --weight=1
-
-# Open TLS port
-ynh_exec_warn_less yunohost firewall allow TCP $tls_port
-
-#=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=3
-
-# Define and install dependencies
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
+chmod -R o-rwx "$install_dir"
+chown -R $app:root "$install_dir"
 
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
@@ -95,9 +32,6 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=3
 
-db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
-ynh_psql_test_if_first_run
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
 ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
 
 #=================================================
@@ -132,14 +66,14 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var/log/$app/$app.log" --needs_exposed_ports "$tls_port"
+yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var/log/$app/$app.log" --needs_exposed_ports "$port_tls"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --line_match="Cleaning old notifications" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external listener" --log_path="systemd"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 1e26174..1c97beb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -10,45 +10,12 @@ source _common.sh
 source ynh_install_go
 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)
-server_name=$(ynh_app_setting_get --app=$app --key=server_name)
-path_url=$(ynh_app_setting_get --app=$app --key=path)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-port=$(ynh_app_setting_get --app=$app --key=port)
-tls_port=$(ynh_app_setting_get --app=$app --key=tls_port)
-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)
-registration=$(ynh_app_setting_get --app=$app --key=registration)
-
 #=================================================
 # CHECK VERSION
 #=================================================
-ynh_script_progression --message="Checking version..." --weight=1
 
 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=3
-
-# 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
 #=================================================
@@ -84,36 +51,6 @@ else
         ynh_app_setting_set --app=$app --key=registration --value=0
 fi
 
-if ! ynh_permission_exists --permission=server_api; then
-    ynh_permission_create --permission=server_api --url=$domain/_matrix \
-                          --label="Server access for client apps." --show_tile=false --allowed=visitors \
-                          --auth_header=false --protected=true
-else
-    ynh_permission_url --permission=server_api --url=$domain/_matrix --remove_url=$server_name/.well-known/matrix \
-                       --auth_header=false
-    ynh_permission_update --permission=server_api --label="Server access for client apps." --show_tile=false \
-                          --protected=true
-fi
-
-if yunohost --output-as plain domain list | grep -q "^$server_name"'$' && ! ynh_permission_exists --permission=server_client_infos; then
-    ynh_permission_create --permission=server_client_infos --url=$server_name/.well-known/matrix \
-                          --label="Server info for clients. (well-known)" --show_tile=false --allowed=visitors \
-                          --auth_header=false --protected=true
-elif yunohost --output-as plain domain list | grep -q "^$server_name"'$'; then
-    ynh_permission_url --permission=server_client_infos --url=$server_name/.well-known/matrix \
-                       --auth_header=false
-    ynh_permission_update --permission=server_client_infos --label="Server info for clients. (well-known)" --show_tile=false \
-                          --protected=true
-fi
-
-#=================================================
-# 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
 #=================================================
@@ -123,19 +60,12 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=3
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path/build" --keep="dendrite.yaml"
+	ynh_setup_source --dest_dir="$install_dir/build" --keep="dendrite.yaml"
 fi
 
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:root "$final_path"
-
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=1
-
-ynh_exec_warn_less ynh_install_app_dependencies "$pkg_dependencies"
+chmod 750 "$install_dir"
+chmod -R o-rwx "$install_dir"
+chown -R $app:root "$install_dir"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -163,31 +93,31 @@ then
 
 	ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION
 
-	pushd "$final_path/build"
+	pushd "$install_dir/build"
 		# Build the sources
 		ynh_use_go
-		export GOPATH="$final_path/build/go"
-		export GOCACHE="$final_path/build/.cache"
-		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/dendrite > /dev/null 2>&1
-		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/create-account > /dev/null 2>&1
-		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/generate-keys > /dev/null 2>&1
+		export GOPATH="$install_dir/build/go"
+		export GOCACHE="$install_dir/build/.cache"
+		CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/dendrite > /dev/null 2>&1
+		CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/create-account > /dev/null 2>&1
+		CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/generate-keys > /dev/null 2>&1
 	popd
 
-	ynh_secure_remove --file="$final_path/build"
+#REMOVEME? 	ynh_secure_remove --file="$install_dir/build"
 	ynh_remove_go
 fi
 
-chown -R $app:root "$final_path"
+chown -R $app:root "$install_dir"
 
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
 ynh_script_progression --message="Updating a configuration file..."
 
-ynh_add_config --template="../conf/dendrite.yaml" --destination="$final_path/dendrite.yaml"
+ynh_add_config --template="../conf/dendrite.yaml" --destination="$install_dir/dendrite.yaml"
 
-chmod 400 "$final_path/dendrite.yaml"
-chown $app:$app "$final_path/dendrite.yaml"
+chmod 400 "$install_dir/dendrite.yaml"
+chown $app:$app "$install_dir/dendrite.yaml"
 
 #=================================================
 # SETUP SYSTEMD
@@ -215,21 +145,14 @@ ynh_use_logrotate --non-append
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var/log/$app/$app.log" --needs_exposed_ports "$tls_port"
+yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var/log/$app/$app.log" --needs_exposed_ports "$port_tls"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --line_match="Cleaning old notifications" --log_path="systemd"
-
-#=================================================
-# 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" --line_match="Starting external listener" --log_path="systemd"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/ynh_install_go b/scripts/ynh_install_go
index e3ad06a..f801501 100644
--- a/scripts/ynh_install_go
+++ b/scripts/ynh_install_go
@@ -30,7 +30,7 @@ export GOENV_ROOT="$goenv_install_dir"
 # However, $PATH is duplicated into $go_path to outlast any manipulation of $PATH
 # You can use the variable `$ynh_go_load_path` to quickly load your Go version
 #  in $PATH for an usage into a separate script.
-# Exemple: $ynh_go_load_path $final_path/script_that_use_gem.sh`
+# Exemple: $ynh_go_load_path $install_dir/script_that_use_gem.sh`
 #
 #
 # Finally, to start a Go service with the correct version, 2 solutions
@@ -72,7 +72,7 @@ ynh_use_go () {
     ynh_go_load_path="PATH=$PATH"
 
     # Sets the local application-specific Go version
-    pushd $final_path
+    pushd $install_dir
         $goenv_install_dir/bin/goenv local $go_version
     popd
 }
diff --git a/tests.toml b/tests.toml
new file mode 100644
index 0000000..474e2db
--- /dev/null
+++ b/tests.toml
@@ -0,0 +1,19 @@
+test_format = 1.0
+
+[default]
+
+    # -------------------------------
+    # Default args to use for install
+    # -------------------------------
+
+    args.server_name = "domain.tld"
+
+    # ------------
+    # Tests to run
+    # ------------
+
+    # -------------------------------
+    # Commits to test upgrade from
+    # -------------------------------
+
+    test_upgrade_from.15f4690b.name = "Upgrade from 0.9.9"