diff --git a/ansible/roles/nova/tasks/start_compute.yml b/ansible/roles/nova/tasks/start_compute.yml
index f3dce9008f..f88e3aa917 100644
--- a/ansible/roles/nova/tasks/start_compute.yml
+++ b/ansible/roles/nova/tasks/start_compute.yml
@@ -12,8 +12,8 @@
       - "/lib/modules:/lib/modules:ro"
       - "/run/:/run/"
       - "/sys/fs/cgroup:/sys/fs/cgroup"
+      - "libvirtd:/var/lib/libvirt"
       - "nova_compute:/var/lib/nova/"
-      - "nova_libvirt:/var/lib/libvirt"
   when: inventory_hostname in groups['compute']
 
 - name: Starting nova-compute container
@@ -28,8 +28,8 @@
       - "/lib/modules:/lib/modules:ro"
       - "/run:/run"
       - "kolla_logs:/var/log/kolla/"
+      - "libvirtd:/var/lib/libvirt"
       - "nova_compute:/var/lib/nova/"
-      - "nova_libvirt:/var/lib/libvirt"
   when:
     - inventory_hostname in groups['compute']
     - not enable_nova_fake | bool
diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index da716b0607..31a59275f5 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -50,10 +50,11 @@ else
         heka{,_socket} \
         ironic_pxe \
         kolla_logs \
+        libvirtd \
         mariadb \
         mongodb \
         neutron_metadata_socket \
-        nova_{compute,libvirt} \
+        nova_compute \
         openvswitch_db \
         rabbitmq
     )