diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
index 3afa5eb..85e9a29 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
@@ -6,8 +6,12 @@
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
-- system.ceilometer.agent.cluster
-- system.prometheus.exporters.libvirt
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- system.linux.storage.loopback
+- system.ceilometer.client.nova_compute
+- system.ceilometer.agent.telemetry.cluster
+- system.ceilometer.agent.polling.default
 - cluster.virtual-offline-pike-ovs-dpdk
 - system.nova.compute.nfv.hugepages
 - system.nova.compute.nfv.cpu_pinning
@@ -30,20 +34,37 @@
     compute_hugepages_size: 2M
     compute_hugepages_count: 2048
     compute_hugepages_mount: /mnt/hugepages_2M
+    loopback_device_size: 20
 
   nova:
     compute:
       vncproxy_url: http://${_param:cluster_vip_address}:6080
-      notification:
-        driver: messagingv2
-        topics: "notifications,${_param:stacklight_notification_topic}"
-        notify_on:
-          state_change: vm_and_task_state
       message_queue:
         members:
           - host: ${_param:openstack_control_node01_address}
           - host: ${_param:openstack_control_node02_address}
           - host: ${_param:openstack_control_node03_address}
+      # Compute nodes on devcloud can have different CPUs, we need this
+      # to make sure live migration always work even when cmp VMs are on different computes
+      cpu_mode: custom
+      libvirt:
+        cpu_model: kvm64
+        logging:
+          level: 3
+          filters: '3:remote 4:event'
+          outputs: '3:syslog:libvirtd'
+          buffer_size: 64
+      qemu:
+        logging:
+          handler: logd
+      virtlog:
+        enabled: true
+        level: 3
+        filters: '3:remote 4:event'
+        outputs: '3:syslog:virtlogd'
+        max_clients: 1024
+        max_size: 2097152
+        max_backups: 3
   neutron:
     compute:
       bgp_vpn: