diff --git a/roles/pvc/tasks/libvirt/main.yml b/roles/pvc/tasks/libvirt/main.yml
index f27fa56..a817ef1 100644
--- a/roles/pvc/tasks/libvirt/main.yml
+++ b/roles/pvc/tasks/libvirt/main.yml
@@ -43,10 +43,9 @@
   ignore_errors: true
 
 - name: configure libvirt for listening
-  replace:
+  template:
+    src: libvirt/libvirtd.default.j2
     dest: /etc/default/libvirtd
-    regexp: '#libvirtd_opts=""'
-    replace: 'libvirtd_opts="--listen"'
   notify: restart libvirtd
 
 - name: install systemd unit file (override default on Bullseye)
diff --git a/roles/pvc/templates/libvirt/libvirtd.default.j2 b/roles/pvc/templates/libvirt/libvirtd.default.j2
new file mode 100644
index 0000000..72774d5
--- /dev/null
+++ b/roles/pvc/templates/libvirt/libvirtd.default.j2
@@ -0,0 +1,8 @@
+# Defaults for libvirtd initscript (/etc/init.d/libvirtd)
+# {{ ansible_managed }}
+
+# Start libvirtd to handle qemu/kvm:
+start_libvirtd="yes"
+
+# options passed to libvirtd, add "-l" to listen on tcp
+libvirtd_opts="--listen"