diff --git a/manifest.toml b/manifest.toml
index 323b232..8b9049a 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -8,6 +8,9 @@ license = "free"
 multi_instance = true
 services = [ "nginx" ]
 
+
+maintainers = ["Lapineige"]
+
 [description]
 en = "Federated social networking server built on ActivityPub open protocol"
 fr = "Serveur de réseautage social fédéré basé sur le protocole ouvert ActivityPub"
@@ -20,67 +23,75 @@ admindoc = "https://bonfirenetworks.org/docs/"
 userdoc = "https://bonfirenetworks.org/docs/"
 code = "https://github.com/bonfire-networks/bonfire-app"
 
-[maintainer]
-name = "Lapineige"
 
-[requirements]
+[integration]
 yunohost = ">= 11.0.0"
+multi_instance = false
 
-[[arguments.install]]
-name = "domain"
-type = "domain"
+[install]
+  [install.domain]
+  type = "domain"
+  help.en = "The domain name to use. Bonfire will be installed at its root path (/). This can't be changed."
+  help.fr = "Nom de domaine à utiliser. Bonfire sera installé à sa racine (/). Cela ne pourra pas être changé."
 
-[[arguments.install]]
-name = "path"
-type = "path"
-example = "/example"
-default = "/"
+  [install.is_public]
+  type = "boolean"
+  default = true
+  help.en = "Should that instance be visible to the fediverse ? It is required for federation."
+  help.fr = "Cette instance doit elle être visible sur le fédiverse? C'est nécessaire pour la fédération."
 
-[[arguments.install]]
-name = "is_public"
-type = "boolean"
-default = true
+  [install.init_main_permission]
+    # this is a generic question - ask strings are automatically handled by YunoHost's core
+    # This won't be saved as setting and will instead be used to initialize the SSOwat permission
+    type = "group"
+    default = "visitors"
 
-[[arguments.install]]
-name = "language"
-type = "string"
-choices = [ "fr", "en" ]
-default = "fr"
+  [install.domain]
+    ask.en = "Choose the application language"
+    ask.fr = "Choisissez la langue de l'application"
+    type = "string"
+    choices = ["fr", "en"]
+    default = "fr"
 
-[arguments.install.ask]
-en = "Choose the application language"
-fr = "Choisissez la langue de l'application"
 
-[[arguments.install]]
-name = "admin"
-type = "user"
+    [install.admin]
+    # this is a generic question - ask strings are automatically handled by YunoHost's core
+    type = "user"
 
-[arguments.install.help]
-en = "Name of the account that will have admin rights on this instance."
-fr = "Le nom du compte qui aura les droits d'administration sur l'instance."
-
-[[arguments.install]]
-name = "password"
-type = "password"
-
-[[arguments.install]]
-name = "media_upload_size"
-type = "string"
-choices = [
-  "1MB",
-  "2MB",
-  "5MB",
-  "10MB",
-  "15MB",
-  "20MB",
-  "35MB",
-  "50MB",
-  "100MB",
-  "150MB"
-]
-default = "20MB"
-
-[arguments.install.help]
-en = "Maximum size of the media uploaded. Can be changed later."
-fr = "Taille maximale des médias mis en ligne. Peut-être modifié ultérieurement."
+    [install.password]
+    # this is a generic question - ask strings are automatically handled by YunoHost's core
+    # Note that user-provided passwords questions are not automatically saved as setting
+    help.en = "Use the help field to add an information for the admin about this question."
+    help.fr = "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question."
+    type = "password"
+    
+    [install.media_upload_size]
+    type = "string"
+    choices = [
+    "1MB",
+    "2MB",
+    "5MB",
+    "10MB",
+    "15MB",
+    "20MB",
+    "35MB",
+    "50MB",
+    "100MB",
+    "150MB"
+    ]
+    default = "20MB"
+    ask.en = "Maximum size of the media uploaded. Can be changed later."
+    ask.fr = "Taille maximale des médias mis en ligne. Peut-être modifié ultérieurement."
 
+[resources]
+    [resources.data_dir]
+    # This will create/remove the data dir as /home/yunohost.app/$app
+    # and store the corresponding setting $data_dir
+    #TODO
+    
+    [resources.ports]
+    # This will pick a random port for reverse-proxying and store it as the $port setting 
+    
+    [resources.database]
+    # This will automatically provision/deprovison a mysql DB and store the corresponding credentials in settings $db_user, $db_name, $db_pwd
+    type = "postgresql"