diff --git a/tasks/main.yml b/tasks/main.yml
index 35f49e8ba1a6446e8e447a8bb3656d1ae1244eaa..419d4e0911428d4a6294f61c51e7695099d64b2d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -22,11 +22,11 @@
   when: ynh_file_install.stat.exists == False
 
 - name: Launch Yunohost postinstall
-  ansible.builtin.command: "
+  ansible.builtin.command:
     yunohost tools postinstall \
-      --domain {{ ynh_main_domain }} \
-      --password {{ ynh_admin_password }} \
-      {% if ynh_ignore_dyndns_server == True %} --ignore-dyndns {% endif %}"
+      --domain "{{ ynh_main_domain }}" \
+      --password "{{ ynh_admin_password }}" \
+      {% if ynh_ignore_dyndns_server == True %} --ignore-dyndns {% endif %}
   when: ynh_file_install.stat.exists == False
 
 - name: Create extra domains
diff --git a/tasks/users.yml b/tasks/users.yml
index 446bfdc27ed386785fa0590e29cd11ef792120dd..ac3e087bad0da05c4ad8c36b4c64da4d7b822f85 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -8,11 +8,11 @@
   ansible.builtin.set_fact: ynh_registered_users="{{ ynh_registered_users_raw.stdout | from_json }}"
 
 - name: Create missing Yunohost users
-  ansible.builtin.command: |
-    yunohost user create {{ item.name }} \
-    -f {{ item.firstname }} \
-    -l {{ item.lastname }} \
-    -d {{ item.mail_domain }} \
-    -p {{ item.pass }}
+  ansible.builtin.command:
+    yunohost user create "{{ item.name }}" \
+    -f "{{ item.firstname }}" \
+    -l "{{ item.lastname }}" \
+    -d "{{ item.mail_domain }}" \
+    -p "{{ item.pass }}"
   loop: "{{ ynh_users }}"
   when: item.name not in ynh_registered_users.users.keys()