--- pve-manager/services/pve-guests.service.qmevent	2020-12-07 16:20:54.000000000 +0000
+++ pve-manager/services/pve-guests.service	2021-06-28 16:35:43.957664419 +0000
@@ -8,11 +8,13 @@ Wants=pveproxy.service
 Wants=spiceproxy.service
 Wants=pve-firewall.service
 Wants=lxc.service
+Wants=qmeventd.service
 After=pveproxy.service
 After=pvestatd.service
 After=spiceproxy.service
 After=pve-firewall.service
 After=lxc.service
+After=qmeventd.service
 After=pve-ha-crm.service pve-ha-lrm.service
 
 [Service]
--- qemu-server/qmeventd/Makefile.qmevent	2021-06-28 16:35:43.888664189 +0000
+++ qemu-server/qmeventd/Makefile	2021-06-28 16:35:43.957664419 +0000
@@ -23,6 +23,7 @@ install: qmeventd docs
 	install -d ${DESTDIR}${SERVICEDIR}
 	install -d ${DESTDIR}${MANDIR}/man8
 	install -m 0644 qmeventd.service ${DESTDIR}${SERVICEDIR}
+	install -m 0644 qmeventd.socket ${DESTDIR}${SERVICEDIR}
 	install -m 0755 qmeventd ${DESTDIR}${SBINDIR}
 	install -m 0644 qmeventd.8 ${DESTDIR}/${MANDIR}/man8
 
--- qemu-server/qmeventd/qmeventd.service.qmevent	2020-12-03 17:08:04.000000000 +0000
+++ qemu-server/qmeventd/qmeventd.service	2021-06-28 16:37:00.923920620 +0000
@@ -1,8 +1,8 @@
 [Unit]
 Description=PVE Qemu Event Daemon
 RequiresMountsFor=/var/run
+Before=pvestatd.service
 Before=pve-ha-lrm.service
-Before=pve-guests.service
 
 [Service]
 ExecStart=/usr/sbin/qmeventd /var/run/qmeventd.sock
@@ -10,3 +10,4 @@ Type=forking
 
 [Install]
 WantedBy=multi-user.target
+Also=qmeventd.socket
--- qemu-server/qmeventd/qmeventd.socket.qmevent	2021-06-28 16:35:43.957664419 +0000
+++ qemu-server/qmeventd/qmeventd.socket	2021-06-28 16:35:43.957664419 +0000
@@ -0,0 +1,8 @@
+[Unit]
+Description=PVE Qemu Event Daemon Socket
+
+[Socket]
+ListenStream=/run/qmeventd.sock
+
+[Install]
+WantedBy=sockets.target