diff --git a/roles/ynh_config/README-FR.md b/roles/ynh_config/README-FR.md
index defa612fe8dafb01c7437e510f741e576c40fc09..8d98649d13badd381fd348bbe60a9baf0db22b32 100644
--- a/roles/ynh_config/README-FR.md
+++ b/roles/ynh_config/README-FR.md
@@ -68,7 +68,7 @@ A partir de Yunohost 11.1, un nouveau groupe d'administrateurs est créé sur l'
 Par défaut, l'utilisateur doit taper son mot de passe pour utiliser la commande sudo mais il est possible de désactiver cette vérification depuis l'interface web (`outils` > `Paramètres de YunoHost` > `Permettre aux administrateurs d'utiliser 'sudo' sans retaper leur mot de passe`) ou en modifiant la variable `ynh_sudo_passwordless` à `true` dans votre fichier de variables Ansible. Plus d'informations disponibles [ici](https://forum.yunohost.org/t/yunohost-11-1-release-sortie-de-yunohost-11-1/23378#sudo-sans-mot-de-passe-16).
 
 ```yml
-ynh_sudo_passwordless: false
+ynh_sudo_passwordless: "false"
 ```
 
 ## Dépendances
diff --git a/roles/ynh_config/README.md b/roles/ynh_config/README.md
index 6158190699c96427c59d6997e27ef383f00cdf1a..9a5a9e5d54a31eb3678f455040de1bb7359efd35 100644
--- a/roles/ynh_config/README.md
+++ b/roles/ynh_config/README.md
@@ -68,7 +68,7 @@ Starting with Yunohost 11.1, a new administrator group is created on the instanc
 By default, the user must type their password to use the sudo command but it is possible to disable this check from the web interface (`tools` > `YunoHost settings` > `Allow admins to use ‘sudo’ without re-typing their passwords`) or by changing the `ynh_sudo_passwordless` variable to `true` in your Ansible variables file. More information available [here](https://forum.yunohost.org/t/yunohost-11-1-release-sortie-de-yunohost-11-1/23378#passwordless-sudo-4).
 
 ``yml
-ynh_sudo_passwordless: false
+ynh_sudo_passwordless: "false"
 ```
 
 ## Dependencies
diff --git a/roles/ynh_config/defaults/main.yml b/roles/ynh_config/defaults/main.yml
index b4a053fd65382488f0501d1cf9936a2ec50a0f32..af7aafb7fb248cc2c5a2972f3b94551b18ab4a09 100644
--- a/roles/ynh_config/defaults/main.yml
+++ b/roles/ynh_config/defaults/main.yml
@@ -39,5 +39,6 @@ ynh_autoupdate:
   # system: True
   # dest_script: "/usr/local/bin/"
 
-ynh_ssh_port:          "22"
-ynh_sudo_passwordless: false
+ynh_ssh_commands:
+  yunohost settings set security.ssh.port -v: "22"
+  yunohost settings set security.password.passwordless_sudo -v: "false"
diff --git a/roles/ynh_config/tasks/ssh_configuration.yml b/roles/ynh_config/tasks/ssh_configuration.yml
index a98b797a77b8f0e8d1f586ceecc920acc6a79194..c563c522505c04e1f1b56d18071210afbc7c1033 100644
--- a/roles/ynh_config/tasks/ssh_configuration.yml
+++ b/roles/ynh_config/tasks/ssh_configuration.yml
@@ -31,3 +31,8 @@
   tags:
     - yunohost
     - ssh
+
+- name: (WIP) YunoHost commands
+  ansible.builtin.command:
+    "{{ item.key }} {{ item.value }}"
+  loop: "{{ ynh_ssh_commands | dict2items }}"