diff --git a/README.md b/README.md
index de68699..244198c 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Conduit is a lightweight open-source server implementation of the Matrix Specification with a focus on easy setup and low system requirements. That means you can make your own Conduit setup in just a few minutes.
 Conduit keeps things simple, it's a single binary with an embedded database and can be much faster than other server implementations in some cases.
 
-**Shipped version:** 0.6.0~ynh2
+**Shipped version:** 0.6.0~ynh3
 ## Documentation and resources
 
 * Official app website: <https://conduit.rs/>
diff --git a/README_fr.md b/README_fr.md
index 52ba450..1b6ca12 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 Conduit est une implémentation de serveur open source légère de la spécification Matrix avec un accent sur une configuration facile et des exigences système faibles. Cela signifie que vous pouvez créer votre propre configuration Conduit en quelques minutes seulement.
 Conduit garde les choses simples, c'est un binaire unique avec une base de données intégrée et peut être beaucoup plus rapide que d'autres implémentations de serveur dans certains cas.
 
-**Version incluse :** 0.6.0~ynh2
+**Version incluse :** 0.6.0~ynh3
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://conduit.rs/>
diff --git a/conf/conduit.toml b/conf/conduit.toml
index e66518a..e1a4f62 100644
--- a/conf/conduit.toml
+++ b/conf/conduit.toml
@@ -31,7 +31,7 @@ max_request_size = 20_000_000 # in bytes
 # Enables registration. If set to false, no users can register on this server.
 allow_registration = __REGISTRATION__
 
-allow_federation = __DISABLE_FEDERATION__
+allow_federation = __FEDERATION__
 allow_check_for_updates = true
 
 # Server to get public keys from. You probably shouldn't change this
diff --git a/config_panel.toml b/config_panel.toml
index 31324af..e22854a 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -13,10 +13,10 @@ name = "Conduit configuration"
         no = "false"
         bind = "allow_registration:/var/www/__APP__/conduit.toml"
 
-        [main.registration.disable_federation]
-        ask = "Disable Federation"
+        [main.registration.federation]
+        ask = "Allow Federation"
         type = "boolean"
         yes = "true"
         no = "false"
-        help = "Do not communicate with other homeservers of the Matrix Federation."
+        help = "Communicate with other homeservers of the Matrix Federation."
         bind = "allow_federation:/var/www/__APP__/conduit.toml"
diff --git a/manifest.toml b/manifest.toml
index dc6f5a9..c640e05 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,9 +5,9 @@ name = "Conduit"
 description.en = "Simple, fast and reliable chat server powered by Matrix"
 description.fr = "Serveur de chat simple, rapide et fiable alimenté par Matrix"
 
-version = "0.6.0~ynh2"
+version = "0.6.0~ynh3"
 
-maintainers = [""]
+maintainers = ["eric_G"]
 
 [upstream]
 license = "Apache-2.0"
diff --git a/scripts/install b/scripts/install
index e1225ba..a877838 100755
--- a/scripts/install
+++ b/scripts/install
@@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers
 
 #server_name=$YNH_APP_ARG_SERVER_NAME
 registration=$YNH_APP_ARG_REGISTRATION
-disable_federation="true"
+federation="true"
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST
@@ -23,7 +23,7 @@ disable_federation="true"
 
 #ynh_app_setting_set --app=$app --key=server_name --value=$server_name
 ynh_app_setting_set --app=$app --key=registration --value=$registration
-ynh_app_setting_set --app=$app --key=disable_federation --value=$disable_federation
+ynh_app_setting_set --app=$app --key=federation --value=$federation
 
 #=================================================
 # APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC)
diff --git a/conf/server_name.conf b/server_name.conf
similarity index 100%
rename from conf/server_name.conf
rename to server_name.conf