diff --git a/roles/tripleo-persist/tasks/cleanup.yml b/roles/tripleo-persist/tasks/cleanup.yml
new file mode 100644
index 000000000..2fad5cabb
--- /dev/null
+++ b/roles/tripleo-persist/tasks/cleanup.yml
@@ -0,0 +1,6 @@
+- name: ensure tripleo_persist storage directory is removed
+  file:
+    path: "{{tripleo_persist_storage_root_dir}}"
+    state: absent
+  delegate_to: localhost
+  become: "{{tripleo_persist_storage_root_become}}"
diff --git a/roles/tripleo-transfer/tasks/cleanup.yml b/roles/tripleo-transfer/tasks/cleanup.yml
new file mode 100644
index 000000000..616689cbc
--- /dev/null
+++ b/roles/tripleo-transfer/tasks/cleanup.yml
@@ -0,0 +1,6 @@
+- name: ensure tripleo_transfer storage directory is removed
+  file:
+    path: "{{tripleo_transfer_storage_root_dir}}"
+    state: absent
+  delegate_to: localhost
+  become: "{{tripleo_transfer_storage_root_become}}"