diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index c8a53d85e7c5958b8688e596477148dfbd8917ad..8dca5ca99d418f66747298dbc4e22e54414c5736 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -709,6 +709,7 @@ nova_backend_ceph: "{{ enable_ceph }}"
 nova_backend: "{{ 'rbd' if nova_backend_ceph | bool else 'default' }}"
 # Valid options are [ kvm, qemu, vmware, xenapi ]
 nova_compute_virt_type: "kvm"
+nova_instance_datadir_volume: "nova_compute"
 
 #######################
 # Murano options
diff --git a/ansible/roles/destroy/tasks/cleanup_host.yml b/ansible/roles/destroy/tasks/cleanup_host.yml
index e36791059de6b36f0caa7a53124fd163748a363c..b1ae71d20c5c903b1cb108d5da63aa2097d14eb7 100644
--- a/ansible/roles/destroy/tasks/cleanup_host.yml
+++ b/ansible/roles/destroy/tasks/cleanup_host.yml
@@ -6,6 +6,7 @@
     enable_haproxy: "{{ enable_haproxy }}"
     enable_swift: "{{ enable_swift }}"
     glance_file_datadir_volume: "{{ glance_file_datadir_volume }}"
+    nova_instance_datadir_volume: "{{ nova_instance_datadir_volume }}"
     kolla_internal_vip_address: "{{ kolla_internal_vip_address }}"
     kolla_external_vip_address: "{{ kolla_external_vip_address }}"
     kolla_dev_repos_directory: "{{ kolla_dev_repos_directory }}"
diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml
index 92a862523825489ba8212ce5f27296f58c59f9d0..40113eddeac74ce02de715040f846d43492b5474 100644
--- a/ansible/roles/nova/defaults/main.yml
+++ b/ansible/roles/nova/defaults/main.yml
@@ -18,7 +18,7 @@ nova_services:
       - "/sys/fs/cgroup:/sys/fs/cgroup"
       - "kolla_logs:/var/log/kolla/"
       - "libvirtd:/var/lib/libvirt"
-      - "nova_compute:/var/lib/nova/"
+      - "{{ nova_instance_datadir_volume }}:/var/lib/nova/"
       - "{% if enable_cinder_backend_nfs | bool %}/var/lib/nova/mnt:/var/lib/nova/mnt:shared{% endif %}"
       - "nova_libvirt_qemu:/etc/libvirt/qemu"
     dimensions: "{{ nova_libvirt_dimensions }}"
@@ -31,7 +31,7 @@ nova_services:
       - "{{ node_config_directory }}/nova-ssh/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - "kolla_logs:/var/log/kolla"
-      - "nova_compute:/var/lib/nova"
+      - "{{ nova_instance_datadir_volume }}:/var/lib/nova"
       - "{% if enable_cinder_backend_nfs | bool %}/var/lib/nova/mnt:/var/lib/nova/mnt:shared{% endif %}"
     dimensions: "{{ nova_ssh_dimensions }}"
   placement-api:
@@ -134,7 +134,7 @@ nova_services:
       - "kolla_logs:/var/log/kolla/"
       - "{% if enable_iscsid | bool %}iscsi_info:/etc/iscsi{% endif %}"
       - "libvirtd:/var/lib/libvirt"
-      - "nova_compute:/var/lib/nova/"
+      - "{{ nova_instance_datadir_volume }}:/var/lib/nova/"
       - "{% if enable_cinder_backend_nfs | bool %}/var/lib/nova/mnt:/var/lib/nova/mnt:shared{% endif %}"
     dimensions: "{{ nova_compute_dimensions }}"
   nova-compute-ironic:
diff --git a/tools/cleanup-host b/tools/cleanup-host
index d9ea768087bdafa713417a8e99b258baaab2b5ba..10a952a1b3e6c5855cda3215fb02d67db356ccf4 100755
--- a/tools/cleanup-host
+++ b/tools/cleanup-host
@@ -56,6 +56,11 @@ if [[ "$glance_file_datadir_volume" != "glance" && -d "$glance_file_datadir_volu
     rm -rfv  $glance_file_datadir_volume
 fi
 
+if [[ "$nova_instance_datadir_volume" != "nova_compute" && -d "$nova_instance_datadir_volume" ]]; then
+    echo "Removing nova_compute volume if it is customzied"
+    rm -rfv  $nova_instance_datadir_volume
+fi
+
 FOLDER_PATH="/etc/kolla/"
 
 if [[ -e "$FOLDER_PATH/ovsdpdk-db/ovs-dpdkctl.sh" ]]; then