diff --git a/roles/ynh_backup/tasks/borgbackup.yml b/roles/ynh_backup/tasks/borgbackup.yml
index b3fca77c4889d62c3b84a8d08bdeedcf850d38af..cae7b3dd2535f53e123cf3b1a2292ce098f02404 100644
--- a/roles/ynh_backup/tasks/borgbackup.yml
+++ b/roles/ynh_backup/tasks/borgbackup.yml
@@ -21,22 +21,30 @@
   ansible.builtin.command: ansible-galaxy install m3nu.ansible_role_borgbackup,v0.9.0 -p ~/.ansible/roles
   delegate_to: localhost
   become: False
-  tags: borg
+  tags:
+  - backup
+  - borg
 
 - name: run BorgBackup role
   ansible.builtin.import_role:
     name: m3nu.ansible_role_borgbackup
-  tags: borg
+  tags:
+  - backup
+  - borg
 
 - name: Create backup folder for BorgBackup repository
   ansible.builtin.file:
     path: "{{ borg_repository }}"
     state: directory
     mode: '0750'
-  tags: borg
+  tags:
+  - backup
+  - borg
 
 - name: Configure host for Borg Remote repository
-  tags: borg
+  tags:
+  - backup
+  - borg
   block:
     - name: deploy ssh public key for BorgBackup
       ansible.builtin.copy:
@@ -62,7 +70,9 @@
     line: "{{ ynh_ssh_borg_command }}"
     state: present
   when: ynh_ssh_borg_command is defined
-  tags: borg
+  tags:
+  - backup
+  - borg
 
 
 - name: change archive name in "/etc/borgmatic/{{ borgmatic_config_name }}"
@@ -71,7 +81,9 @@
     regexp: "archive_name_format:"
     line: "    archive_name_format: {{ borg_archive_name_format }}"
     state: present
-  tags: borg
+  tags:
+  - backup
+  - borg
 
 - name: Create borg launch script in /usr/local/bin
   ansible.builtin.copy:
@@ -83,8 +95,12 @@
     owner: root
     group: root
     mode: "0755"
-  tags: borg
+  tags:
+  - backup
+  - borg
 
 - name: Initialize a new Borg repository
   ansible.builtin.command: "{{ borg_init_command }}"
-  tags: borg
+  tags:
+  - backup
+  - borg
diff --git a/roles/ynh_backup/tasks/main.yml b/roles/ynh_backup/tasks/main.yml
index caec44180a9b009372b92bafeb4b24f59987d414..ac16ba4efa5c10d4d7a1caa05b8f7fb35c405561 100644
--- a/roles/ynh_backup/tasks/main.yml
+++ b/roles/ynh_backup/tasks/main.yml
@@ -26,4 +26,6 @@
 - name: Use Borg Backup with YunoHost
   ansible.builtin.include_tasks: borgbackup.yml
   when: ynh_borg_backup_scheduled
-  tags: borg
+  tags:
+  - backup
+  - borg