diff --git a/README.md b/README.md
index b5f721e..32ddbf9 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -60,4 +60,4 @@ or
 sudo yunohost app upgrade galene -u https://github.com/YunoHost-Apps/galene_ynh/tree/testing --debug
 ```
 
-**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
\ No newline at end of file
diff --git a/README_fr.md b/README_fr.md
index 19f26e7..8be747e 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
diff --git a/scripts/install b/scripts/install
index 2f31bab..b56ffc8 100755
--- a/scripts/install
+++ b/scripts/install
@@ -93,24 +93,24 @@ password_hash=$(echo $($install_dir/galene-password-generator $password))
 ynh_app_setting_set --app=$app --key=password_hash --value="$password_hash"
 
 # Configure Galène
-ynh_add_config --template="../conf/config.json" --destination="$install_dir/live/data/config.json"
+ynh_add_config --template="config.json" --destination="$install_dir/live/data/config.json"
 chmod 400 "$install_dir/live/data/config.json"
 chown $app:$app "$install_dir/live/data/config.json"
 
 # Configure Galène LDAP
 key=$(jose jwk gen -i '{"kty":"oct","alg":"HS256"}')
 ynh_app_setting_set --app=$app --key=key --value="$key"
-ynh_add_config --template="../conf/galene-ldap.json" --destination="$install_dir/live_ldap/data/galene-ldap.json"
+ynh_add_config --template="galene-ldap.json" --destination="$install_dir/live_ldap/data/galene-ldap.json"
 chmod 400 "$install_dir/live_ldap/data/galene-ldap.json"
 chown $app:$app "$install_dir/live_ldap/data/galene-ldap.json"
 
 # Create a group name config
-ynh_add_config --template="../conf/groupname.json" --destination="$data_dir/groups/$group_name.json"
+ynh_add_config --template="groupname.json" --destination="$data_dir/groups/$group_name.json"
 chmod 400 "$data_dir/groups/$group_name.json"
 chown $app:$app "$data_dir/groups/$group_name.json"
 
 # Create a group name authenticated on LDAP
-ynh_add_config --template="../conf/groupname-ldap.json" --destination="$data_dir/groups/YunoHost_Users.json"
+ynh_add_config --template="groupname-ldap.json" --destination="$data_dir/groups/YunoHost_Users.json"
 chmod 400 "$data_dir/groups/YunoHost_Users.json"
 chown $app:$app "$data_dir/groups/YunoHost_Users.json"
 
diff --git a/scripts/remove b/scripts/remove
index 1ed6e4b..7d80332 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -14,6 +14,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE SERVICE INTEGRATION IN YUNOHOST
 #=================================================
+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
@@ -28,20 +29,10 @@ then
 	yunohost service remove ${app}_ldap
 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
 ynh_remove_systemd_config --service=${app}_ldap
 
-#=================================================
-# REMOVE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
-
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 0e05f93..061381c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -16,12 +16,6 @@ source /usr/share/yunohost/helpers
 
 password=$(ynh_app_setting_get --app=$app --key=password)
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -82,28 +76,27 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building app..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_exec_warn_less ynh_install_go --go_version=$go_version
-	ynh_use_go
-	pushd $install_dir/build/galene-password-generator/
-		ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -o $install_dir/
-	popd
-	pushd $install_dir/build/
-		ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live/
-	popd
-	pushd $install_dir/build_ldap/
-		ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live_ldap/
-	popd
-	ynh_remove_go
-	ynh_secure_remove --file="$install_dir/build/"
-	ynh_secure_remove --file="$install_dir/build_ldap/"
-	ynh_secure_remove --file="$install_dir/.cache/"
-	ynh_secure_remove --file="$install_dir/go/"
-	ynh_secure_remove --file="$install_dir/.go-version"
+ynh_exec_warn_less ynh_install_go --go_version=$go_version
+ynh_use_go
 
-	chmod +x "$install_dir/galene-password-generator"
-fi
+pushd $install_dir/build/galene-password-generator/
+	ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -o $install_dir/
+popd
+pushd $install_dir/build/
+	ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live/
+popd
+pushd $install_dir/build_ldap/
+	ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live_ldap/
+popd
+
+ynh_remove_go
+ynh_secure_remove --file="$install_dir/build/"
+ynh_secure_remove --file="$install_dir/build_ldap/"
+ynh_secure_remove --file="$install_dir/.cache/"
+ynh_secure_remove --file="$install_dir/go/"
+ynh_secure_remove --file="$install_dir/.go-version"
+
+chmod +x "$install_dir/galene-password-generator"
 
 #=================================================
 # UPDATE A CONFIG FILE
@@ -116,7 +109,7 @@ if [ -z "${password_hash:-}" ]; then
 	ynh_app_setting_set --app=$app --key=password_hash --value="$password_hash"
 fi
 # Configure Galène
-ynh_add_config --template="../conf/config.json" --destination="$install_dir/live/data/config.json"
+ynh_add_config --template="config.json" --destination="$install_dir/live/data/config.json"
 chmod 400 "$install_dir/live/data/config.json"
 chown $app:$app "$install_dir/live/data/config.json"
 
@@ -126,17 +119,17 @@ if [ -z "${key:-}" ]; then
 	key=$(jose jwk gen -i '{"kty":"oct","alg":"HS256"}')
 	ynh_app_setting_set --app=$app --key=key --value=$key
 fi
-ynh_add_config --template="../conf/galene-ldap.json" --destination="$install_dir/live_ldap/data/galene-ldap.json"
+ynh_add_config --template="galene-ldap.json" --destination="$install_dir/live_ldap/data/galene-ldap.json"
 chmod 400 "$install_dir/live_ldap/data/galene-ldap.json"
 chown $app:$app "$install_dir/live_ldap/data/galene-ldap.json"
 
 # Create a group name config
-ynh_add_config --template="../conf/groupname.json" --destination="$data_dir/groups/$group_name.json"
+ynh_add_config --template="groupname.json" --destination="$data_dir/groups/$group_name.json"
 chmod 400 "$data_dir/groups/$group_name.json"
 chown $app:$app "$data_dir/groups/$group_name.json"
 
 # Create a group name authenticated on LDAP
-ynh_add_config --template="../conf/groupname-ldap.json" --destination="$data_dir/groups/YunoHost_Users.json"
+ynh_add_config --template="groupname-ldap.json" --destination="$data_dir/groups/YunoHost_Users.json"
 chmod 400 "$data_dir/groups/YunoHost_Users.json"
 chown $app:$app "$data_dir/groups/YunoHost_Users.json"