diff --git a/configs.yml b/configs.yml
index 0a5904c..228adaa 100644
--- a/configs.yml
+++ b/configs.yml
@@ -117,12 +117,3 @@ gaming:
         - lib32-gst-plugins-base-libs
         - vulkan-icd-loader
         - lib32-vulkan-icd-loader
-
-libvirt:
-    - run:
-        - sudo systemctl start libvirtd.service && sudo systemctl enable libvirtd.service
-    - run:
-        - virsh pool-define-as libvirt-pool dir - - - - "/home/${USER}/.local/libvirt/images";
-          virsh pool-build libvirt-pool &&
-          virsh pool-start libvirt-pool &&
-          virsh pool-autostart libvirt-pool
diff --git a/roles/libvirt/handlers/main.yml b/roles/libvirt/handlers/main.yml
new file mode 100644
index 0000000..ae7db1b
--- /dev/null
+++ b/roles/libvirt/handlers/main.yml
@@ -0,0 +1,7 @@
+---
+- name: Enable libvirtd service
+  systemd:
+    name: libvirtd
+    enabled: true
+    state: started
+    scope: system
diff --git a/roles/libvirt/tasks/main.yml b/roles/libvirt/tasks/main.yml
index 59e8f19..acf7cfa 100644
--- a/roles/libvirt/tasks/main.yml
+++ b/roles/libvirt/tasks/main.yml
@@ -33,3 +33,18 @@
     backrefs: true
     backup: true
   when: "'libvirt libvirt_guest' not in nsswitch_content"
+  notify: Enable libvirtd service
+
+- name: Define session pool
+  virt_pool:
+    command: define
+    name: libvirt-pool
+    uri: "qemu:///session"
+    xml: "{{ lookup('template', 'libvirt-pool.xml.j2') }}"
+
+- name: Start session pool
+  virt_pool:
+    state: active
+    autostart: true
+    name: libvirt-pool
+    uri: "qemu:///session"
diff --git a/roles/libvirt/templates/libvirt-pool.xml.j2 b/roles/libvirt/templates/libvirt-pool.xml.j2
new file mode 100644
index 0000000..d102d6c
--- /dev/null
+++ b/roles/libvirt/templates/libvirt-pool.xml.j2
@@ -0,0 +1,13 @@
+<pool type='dir'>
+  <name>libvirt-pool</name>
+  <source>
+  </source>
+  <target>
+    <path>/home/{{ ansible_facts['env']['USER'] }}/.local/libvirt/images</path>
+    <permissions>
+      <mode>0711</mode>
+      <owner>1000</owner>
+      <group>1000</group>
+    </permissions>
+  </target>
+</pool>