diff --git a/playbooks/roles/music/rip/tasks/include/libvirt.yml b/playbooks/roles/music/rip/tasks/include/libvirt.yml
deleted file mode 100644
index 09f3f6c..0000000
--- a/playbooks/roles/music/rip/tasks/include/libvirt.yml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- name: "libvirt : install libvirt"
-  ansible.builtin.apt:
-    name:
-      - "dnsmasq"
-      - "libvirt-daemon-system"
-      - "netcat"
-      - "qemu-system"
-    install_recommends: false
-  register: music_rip_libvirt_install
-
-- name: "libvirt : install zfs storage driver for libvirt"
-  ansible.builtin.apt:
-    name:
-      - "libvirt-daemon-driver-storage-zfs"
-  when:
-    "'zfs' in group_names"
-  register: music_rip_libvirt_zfs_install
-
-- name: "libvirt : enable libvirtd"
-  ansible.builtin.systemd:
-    name: "libvirtd"
-    enabled: true
-
-- name: "libvirt : start libvirtd"
-  ansible.builtin.systemd:
-    name: "libvirtd"
-    state: "started"
-  register: music_rip_libvirt_start
-
-- name: "libvirt : restart libvirtd"
-  ansible.builtin.systemd:
-    name: "libvirtd"
-    state: "restarted"
-  when:
-    (music_rip_libvirt_install.changed or
-    (music_rip_libvirt_zfs_install is defined and
-    music_rip_libvirt_zfs_install.changed)) and
-    not music_rip_libvirt_start.changed
-
-
-- name: "libvirt : add {{ music_user_name }} to group \"libvirt\""
-  ansible.builtin.user:
-    name: "{{ music_user_name }}"
-    groups: "libvirt"
-    append: true
diff --git a/playbooks/roles/music/rip/tasks/main.yml b/playbooks/roles/music/rip/tasks/main.yml
index 3042178..0211d82 100644
--- a/playbooks/roles/music/rip/tasks/main.yml
+++ b/playbooks/roles/music/rip/tasks/main.yml
@@ -8,8 +8,3 @@
   ansible.builtin.import_tasks: "include/samba.yml"
   tags:
     - "music:rip:samba"
-
-- name: "play:music : role:rip : tasks:libvirt"
-  ansible.builtin.import_tasks: "include/libvirt.yml"
-  tags:
-    - "music:rip:libvirt"
diff --git a/playbooks/system.yml b/playbooks/system.yml
index 7bbfb12..ded917e 100644
--- a/playbooks/system.yml
+++ b/playbooks/system.yml
@@ -101,6 +101,17 @@
       vars:
         system_base_user_become_user: "{{ system_base_ssh_user }}"
 
+- name: "system : yggdrasil"
+  hosts: "yggdrasil"
+  roles:
+    - role: "system/extra/libvirt"
+      tags:
+        - "system:extra"
+        - "system:extra:libvirt"
+      vars:
+        system_extra_libvirt_user_name: "{{ system_base_ssh_user }}"
+        system_extra_libvirt_install_zfs_driver: "{{ 'zfs' in group_names }}"
+
 - name: "system : asgard:&zfs"
   hosts: "asgard:&zfs"
   roles:
diff --git a/roles b/roles
index 403b65f..c4af717 160000
--- a/roles
+++ b/roles
@@ -1 +1 @@
-Subproject commit 403b65f81280ec1e4d9a3b9d2816b3f3b42587f8
+Subproject commit c4af7178b2bfda71c58bad3be09576f53a6d7603