diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index aac9a0ed40..ecca37246b 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -310,7 +310,7 @@ outputs:
                   - /run:/run
                   - /sys/fs/cgroup:/sys/fs/cgroup
                   - /var/lib/nova:/var/lib/nova:shared
-                  - /var/run/libvirt:/var/run/libvirt
+                  - /var/run/libvirt:/var/run/libvirt:shared
                   - /var/lib/libvirt:/var/lib/libvirt
                   - /etc/libvirt/qemu:/etc/libvirt/qemu:ro
                   - /var/log/libvirt/qemu:/var/log/libvirt/qemu
@@ -409,6 +409,9 @@ outputs:
             - /etc/libvirt/qemu
             - /var/lib/libvirt
             - /var/log/containers/libvirt
+            - /var/run/libvirt
+            - /var/log/libvirt
+            - /var/log/libvirt/qemu
         # qemu user on host will be cretaed by libvirt package install, ensure
         # the qemu user created with same uid/gid as like libvirt package.
         # These specific values are required since ovs is running on host.
@@ -452,6 +455,11 @@ outputs:
             - libvirtd.service
             - virtlogd.socket
           when: libvirt_installed.rc == 0
+        - name: ensure /var/run/libvirt is present upon reboot
+          copy:
+            dest: /etc/tmpfiles.d/var-run-libvirt.conf
+            content: |
+              d /var/run/libvirt 0755 root root - -
       metadata_settings:
         get_attr: [NovaLibvirtBase, role_data, metadata_settings]
       upgrade_tasks: