diff --git a/ansible/cleanup.yml b/ansible/destroy.yml
similarity index 65%
rename from ansible/cleanup.yml
rename to ansible/destroy.yml
index 14d5668cfb9c15c905d3c85eec455bb099ab8ecb..73b0870727197722fc997eda6093c183077d053c 100644
--- a/ansible/cleanup.yml
+++ b/ansible/destroy.yml
@@ -1,4 +1,4 @@
 ---
 - hosts: all
   roles:
-    - cleanup
+    - destroy
diff --git a/ansible/roles/cleanup/defaults/main.yml b/ansible/roles/cleanup/defaults/main.yml
deleted file mode 100644
index 6c65e69530cf1c84b0f4a01ac7dcca60ec022c7b..0000000000000000000000000000000000000000
--- a/ansible/roles/cleanup/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-cleanup_include_images: no
diff --git a/ansible/roles/cleanup/tasks/cleanup_images.yml b/ansible/roles/cleanup/tasks/cleanup_images.yml
deleted file mode 100644
index 9b03f274c0f50f6b8100594eb417150e517f20af..0000000000000000000000000000000000000000
--- a/ansible/roles/cleanup/tasks/cleanup_images.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: Cleaning Kolla images
-  command: /tmp/kolla-cleanup/tools/cleanup-images
-  when:
-    - cleanup_include_images | bool
diff --git a/ansible/roles/destroy/defaults/main.yml b/ansible/roles/destroy/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0d75e357dea39bef3df3d0d1547532d699eef1f0
--- /dev/null
+++ b/ansible/roles/destroy/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+destroy_include_images: no
diff --git a/ansible/roles/cleanup/tasks/cleanup_containers.yml b/ansible/roles/destroy/tasks/cleanup_containers.yml
similarity index 53%
rename from ansible/roles/cleanup/tasks/cleanup_containers.yml
rename to ansible/roles/destroy/tasks/cleanup_containers.yml
index 1de152267829f98538b0606e92bf41e019bb9d2c..4ccdd9cdd87c11445035870ce8566cd5283a901b 100644
--- a/ansible/roles/cleanup/tasks/cleanup_containers.yml
+++ b/ansible/roles/destroy/tasks/cleanup_containers.yml
@@ -1,3 +1,3 @@
 ---
-- name: Cleaning all containers and volumes
+- name: Destroying all Kolla containers and volumes
   command: /tmp/kolla-cleanup/tools/cleanup-containers
diff --git a/ansible/roles/cleanup/tasks/cleanup_host.yml b/ansible/roles/destroy/tasks/cleanup_host.yml
similarity index 56%
rename from ansible/roles/cleanup/tasks/cleanup_host.yml
rename to ansible/roles/destroy/tasks/cleanup_host.yml
index 266ce1752ef19a7418ddb2c7915ca7a1b1548e46..9429eba6b1cb861f6652a23d65e3d9585bc6e433 100644
--- a/ansible/roles/cleanup/tasks/cleanup_host.yml
+++ b/ansible/roles/destroy/tasks/cleanup_host.yml
@@ -1,8 +1,8 @@
 ---
-- name: Cleaning host
+- name: Destroying Kolla host configuration
   command: /tmp/kolla-cleanup/tools/cleanup-host
 
-- name: Removing kolla-cleanup folder
+- name: Destroying kolla-cleanup folder
   file:
     path: /tmp/kolla-cleanup
     state: absent
diff --git a/ansible/roles/destroy/tasks/cleanup_images.yml b/ansible/roles/destroy/tasks/cleanup_images.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e6b8d6073a009780e2a4a57d3ed5f6c35a1e80d1
--- /dev/null
+++ b/ansible/roles/destroy/tasks/cleanup_images.yml
@@ -0,0 +1,5 @@
+---
+- name: Destroying Kolla images
+  command: /tmp/kolla-cleanup/tools/cleanup-images
+  when:
+    - destroy_include_images | bool
diff --git a/ansible/roles/cleanup/tasks/copy_tools.yml b/ansible/roles/destroy/tasks/copy_tools.yml
similarity index 94%
rename from ansible/roles/cleanup/tasks/copy_tools.yml
rename to ansible/roles/destroy/tasks/copy_tools.yml
index 192d3bf537f36cd9d37a3ecf4c192c901357aa04..6a990e197c888acc1f054015221b3da4f0ac9bb7 100644
--- a/ansible/roles/cleanup/tasks/copy_tools.yml
+++ b/ansible/roles/destroy/tasks/copy_tools.yml
@@ -28,4 +28,4 @@
     dest: /tmp/kolla-cleanup/tools
     mode: 0755
   when:
-    - cleanup_include_images | bool
+    - destroy_include_images | bool
diff --git a/ansible/roles/cleanup/tasks/main.yml b/ansible/roles/destroy/tasks/main.yml
similarity index 100%
rename from ansible/roles/cleanup/tasks/main.yml
rename to ansible/roles/destroy/tasks/main.yml
diff --git a/tools/kolla-ansible b/tools/kolla-ansible
index d3416fb5876548d47d18b9d14655617458c6c8a1..030f0323e68e10f67ae4032d20110c26602e2380 100755
--- a/tools/kolla-ansible
+++ b/tools/kolla-ansible
@@ -42,8 +42,8 @@ Commands:
     prechecks           Do pre-deployment checks for hosts
     mariadb_recovery    Recover a completely stopped mariadb cluster
     deploy              Deploy and start all kolla containers
-    cleanup             Cleanup containers, volumes and host
-                        ('-e cleanup_include_images=yes' to also remove Kolla images)
+    destroy             Destroy Kolla containers, volumes and host configuration
+                        ('-e destroy_include_images=yes' to also destroy Kolla images)
     post-deploy         Do post deploy on deploy node
     pull                Pull all images for containers (only pulls, no running container changes)
     reconfigure         Reconfigure OpenStack service
@@ -140,9 +140,9 @@ case "$1" in
         EXTRA_OPTS="$EXTRA_OPTS -e action=deploy"
         PLAYBOOK="${BASEDIR}/ansible/mariadb_recovery.yml"
         ;;
-(cleanup)
-        ACTION="Cleanup containers, volumes and host"
-        PLAYBOOK="${BASEDIR}/ansible/cleanup.yml"
+(destroy)
+        ACTION="Destroy Kolla containers, volumes and host configuration"
+        PLAYBOOK="${BASEDIR}/ansible/destroy.yml"
         ;;
 (deploy)
         ACTION="Deploying Playbooks"