diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 1513e99490..c808fd0eda 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -717,6 +717,7 @@ gnocchi_backend_storage: "{% if enable_ceph | bool and not enable_swift | bool %
 
 # Valid options are [redis, '']
 gnocchi_incoming_storage: "{{ 'redis' if enable_redis | bool else '' }}"
+gnocchi_metric_datadir_volume: "gnocchi"
 
 
 #################################
diff --git a/ansible/roles/destroy/tasks/cleanup_host.yml b/ansible/roles/destroy/tasks/cleanup_host.yml
index b1ae71d20c..e0e5272348 100644
--- a/ansible/roles/destroy/tasks/cleanup_host.yml
+++ b/ansible/roles/destroy/tasks/cleanup_host.yml
@@ -7,6 +7,7 @@
     enable_swift: "{{ enable_swift }}"
     glance_file_datadir_volume: "{{ glance_file_datadir_volume }}"
     nova_instance_datadir_volume: "{{ nova_instance_datadir_volume }}"
+    gnocchi_metric_datadir_volume: "{{ gnocchi_metric_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/gnocchi/defaults/main.yml b/ansible/roles/gnocchi/defaults/main.yml
index fc9f478c4f..79e4530912 100644
--- a/ansible/roles/gnocchi/defaults/main.yml
+++ b/ansible/roles/gnocchi/defaults/main.yml
@@ -10,7 +10,7 @@ gnocchi_services:
     volumes:
       - "{{ node_config_directory }}/gnocchi-api/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
-      - "gnocchi:/var/lib/gnocchi/"
+      - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/"
       - "kolla_logs:/var/log/kolla/"
     dimensions: "{{ gnocchi_api_dimensions }}"
     haproxy:
@@ -32,7 +32,7 @@ gnocchi_services:
     volumes:
       - "{{ node_config_directory }}/gnocchi-metricd/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
-      - "gnocchi:/var/lib/gnocchi/"
+      - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/"
       - "kolla_logs:/var/log/kolla/"
     dimensions: "{{ gnocchi_metricd_dimensions }}"
   gnocchi-statsd:
@@ -43,7 +43,7 @@ gnocchi_services:
     volumes:
       - "{{ node_config_directory }}/gnocchi-statsd/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
-      - "gnocchi:/var/lib/gnocchi/"
+      - "{{ gnocchi_metric_datadir_volume }}:/var/lib/gnocchi/"
       - "kolla_logs:/var/log/kolla/"
     dimensions: "{{ gnocchi_statsd_dimensions }}"
 
diff --git a/tools/cleanup-host b/tools/cleanup-host
index 10a952a1b3..a22628acd4 100755
--- a/tools/cleanup-host
+++ b/tools/cleanup-host
@@ -61,6 +61,11 @@ if [[ "$nova_instance_datadir_volume" != "nova_compute" && -d "$nova_instance_da
     rm -rfv  $nova_instance_datadir_volume
 fi
 
+if [[ "$gnocchi_metric_datadir_volume" != "gnocchi" && -d "$gnocchi_metric_datadir_volume" ]]; then
+    echo "Removing gnocchi volume if it is customzied"
+    rm -rfv  $gnocchi_metric_datadir_volume
+fi
+
 FOLDER_PATH="/etc/kolla/"
 
 if [[ -e "$FOLDER_PATH/ovsdpdk-db/ovs-dpdkctl.sh" ]]; then