diff --git a/conf/nginx.conf b/conf/nginx.conf
index 32329ce..aaa7b37 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,11 +1,11 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-            proxy_pass              http://127.0.0.1:__PORT__;
-            proxy_set_header        X-Real-IP $remote_addr;
-            proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header        Host $http_host;
-            proxy_set_header        X-Forwarded-Proto $scheme;
+    proxy_pass         http://127.0.0.1:__PORT__;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   Host $http_host;
+    proxy_set_header   X-Forwarded-Proto $scheme;
 
-            expires 0m;
-        }
+    expires 0m;
+}
diff --git a/manifest.toml b/manifest.toml
index a35a09d..3e2a96b 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -1,18 +1,18 @@
 packaging_format = 2
 
 id = "xwiki"
-name = "Xwiki"
-description.en = "Explain in *a few (10~15) words* the purpose of the app or what it actually does (it is meant to give a rough idea to users browsing a catalog of 100+ apps)"
-description.fr = "Expliquez en *quelques* (10~15) mots l'utilité de l'app ou ce qu'elle fait (l'objectif est de donner une idée grossière pour des utilisateurs qui naviguent dans un catalogue de 100+ apps)"
+name = "xWiki"
+description.en = "Collaboration tool based on the wiki principle"
+description.fr = "Outil de collaboration basé sur le principe du wiki"
 
 version = "14.10.8~ynh1"
 
-maintainers = ["johndoe"]
+maintainers = [""]
 
 [upstream]
 license = "LGPL-2.1"
 website = "https://www.xwiki.org/"
-demo = "https://demo.example.com"
+demo = "https://playground.xwiki.org/xwiki/bin/view/Main/WebHome"
 admindoc = "https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/"
 userdoc = "https://www.xwiki.org/xwiki/bin/view/Documentation/UserGuide/"
 code = "https://github.com/xwiki/xwiki-platform"
diff --git a/scripts/install b/scripts/install
index 56e03eb..0b61716 100755
--- a/scripts/install
+++ b/scripts/install
@@ -33,7 +33,7 @@ ynh_add_nginx_config
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Collaboration tool" --log="/var/log/$app/$app.log"
 
 #=================================================
 # APP INITIAL CONFIGURATION
diff --git a/scripts/remove b/scripts/remove
index e62239a..5db6c8a 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -16,16 +16,14 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
-# This should be a symetric version of what happens in the install script
-
 # 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
-#fi
+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
+fi
 
-#ynh_remove_systemd_config
+ynh_remove_systemd_config
 
 ynh_remove_nginx_config
 
diff --git a/scripts/restore b/scripts/restore
index 7c88a44..696d6b0 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -48,7 +48,7 @@ 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
 
-yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Collaboration tool" --log="/var/log/$app/$app.log"
 
 #=================================================
 # GENERIC FINALIZATION
@@ -57,7 +57,6 @@ yunohost service add $app --description="A short description of the app" --log="
 #=================================================
 ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
 
-# Typically you only have either $app or php-fpm but not both at the same time...
 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 0393df2..00f908e 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -29,7 +29,7 @@ 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="$install_dir"
+	ynh_setup_source --dest_dir="$install_dir" --keep ="xwiki_env"
 fi
 
 chown -R $app:www-data "$install_dir"
@@ -43,19 +43,7 @@ ynh_add_nginx_config
 
 ynh_add_systemd_config
 
-yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log"
-
-#=================================================
-# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...)
-#=================================================
-# UPDATE A CONFIG FILE
-#=================================================
-ynh_script_progression --message="Updating a configuration file..." --weight=1
-
-ynh_add_config --template="some_config_file" --destination="$install_dir/some_config_file"
-
-chmod 400 "$install_dir/some_config_file"
-chown $app:$app "$install_dir/some_config_file"
+yunohost service add $app --description="Collaboration tool" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/tests.toml b/tests.toml
new file mode 100644
index 0000000..d64ef3c
--- /dev/null
+++ b/tests.toml
@@ -0,0 +1,7 @@
+test_format = 1.0
+
+[default]
+
+    # ------------
+    # Tests to run
+    # ------------
diff --git a/tests.toml.example b/tests.toml.example
deleted file mode 100644
index 3a732e4..0000000
--- a/tests.toml.example
+++ /dev/null
@@ -1,55 +0,0 @@
-test_format = 1.0
-
-[default]
-
-    # ------------
-    # Tests to run
-    # ------------
-
-    # NB: the tests to run are automatically deduced by the CI script according to the
-    # content of the app's manifest. The declarations below allow to customize which
-    # tests are ran, possibly add special test suite to test special args, or
-    # declare which commits to test upgrade from.
-    #
-    # You can also decide (though this is discouraged!) to ban/ignore some tests,
-
-    exclude = ["install.private", "install.multi"]  # The test IDs to be used in only/exclude statements are: install.root, install.subdir, install.nourl, install.multi, backup_restore, upgrade, upgrade.someCommitId change_url
-    # NB: you should NOT need this except if you really have a good reason...
-
-    # For special usecases, sometimes you need to setup other things on the machine
-    # prior to installing the app (such as installing another app)
-    # (Remove this key entirely if not needed)
-    preinstall = """
-    sudo yunohost app install foobar
-    sudo yunohost user list
-    """
-
-    # -------------------------------
-    # Default args to use for install
-    # -------------------------------
-    
-    # By default, the CI will automagically fill the 'standard' args
-    # such as domain, path, admin, is_public and password with relevant values
-    # and also install args with a "default" provided in the manifest..
-    # It should only make sense to declare custom args here for args with no default values
-
-    args.language = "fr_FR"    # NB: you should NOT need those lines unless for custom questions with no obvious/default value
-    args.multisite = 0
-
-    # -------------------------------
-    # Commits to test upgrade from
-    # -------------------------------
-
-    test_upgrade_from.00a1a6e7.name = "Upgrade from 5.4"
-    test_upgrade_from.00a1a6e7.args.foo = "bar"
-
-
-# This is an additional test suite
-[some_additional_testsuite]
-
-    # On additional tests suites, you can decide to run only specific tests
-
-    only = ["install.subdir"]    
-
-    args.language = "en_GB"
-    args.multisite = 1