diff --git a/conf/nginx.conf b/conf/nginx.conf
index 9e0e94b..6cd2808 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -7,8 +7,6 @@ location __PATH__/ {
 
     more_set_headers "Content-Security-Policy: frame-ancestors 'self'";
     
-    more_set_headers "Content-Security-Policy: frame-ancestors 'self'";
-    
     # Include SSOWAT user panel.
     include conf.d/yunohost_panel.conf.inc;
 }
diff --git a/manifest.toml b/manifest.toml
index 7e1d1f8..0ffcbb8 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -18,11 +18,11 @@ code = "https://github.com/vector-im/element-web/"
 cpe = "cpe:2.3:a:matrix:element"
 
 [integration]
-yunohost = ">= 11.1.6"
+yunohost = ">= 11.1.7"
 architectures = "all"
 multi_instance = true
 ldap = false
-sso = true
+sso = false
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
diff --git a/scripts/install b/scripts/install
index 9bdcc9f..64880c8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -13,13 +13,11 @@ source /usr/share/yunohost/helpers
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-# Retrieve arguments
 login_for_welcome=true
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome
 
@@ -32,13 +30,12 @@ ynh_script_progression --message="Setting up source files..." --weight=4
 ynh_setup_source --dest_dir="$install_dir"
 
 # Set permissions to app files
-chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
-# NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+ynh_script_progression --message="Adding system configurations related to $app ..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
diff --git a/scripts/remove b/scripts/remove
index e7f44d8..b41853e 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,9 +10,9 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# REMOVE NGINX CONFIGURATION
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
diff --git a/scripts/restore b/scripts/restore
index 8c46058..e840b8e 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -27,17 +27,14 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 ynh_restore_file --origin_path="$install_dir"
 
 # Set permissions to app files
-chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 chmod 400 "$install_dir/config.json"
 chown $app:$app "$install_dir/config.json"
 
 #=================================================
-# GENERIC FINALIZATION
+# RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-# RELOAD NGINX AND PHP-FPM
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 8ae8200..b465a99 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -44,7 +44,6 @@ then
 fi
 
 # Set permissions to app files
-chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
@@ -58,9 +57,9 @@ chown -R $app:www-data "$install_dir"
 #chown $app:$app "$install_dir/config.json"
 
 #=================================================
-# NGINX CONFIGURATION
+# REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
diff --git a/tests.toml b/tests.toml
index 130a523..1d33b64 100644
--- a/tests.toml
+++ b/tests.toml
@@ -2,6 +2,12 @@ test_format = 1.0
 
 [default]
 
+    # -------------------------------
+    # Default args to use for install
+    # -------------------------------
+    
+    args.default_home_server = "matrix.org"
+
     # -------------------------------
     # Commits to test upgrade from
     # -------------------------------