diff --git a/tools/cleanup-host b/tools/cleanup-host
index 5bb357c4ac..75ed47bd33 100755
--- a/tools/cleanup-host
+++ b/tools/cleanup-host
@@ -32,3 +32,15 @@ sudo cp /etc/fstab /etc/fstab_backup
 
 echo "Removing ceph references from fstab..."
 sudo sed -i '/\/var\/lib\/ceph\/osd\//d' /etc/fstab
+
+echo "Getting folders name..."
+FOLDER_PATH="/etc/kolla/"
+for dir in $FOLDER_PATH*; do
+    if [ "$dir" == "$FOLDER_PATH""passwords.yml" ] || \
+       [ "$dir" == "$FOLDER_PATH""globals.yml" ] || \
+       [ "$dir" == "$FOLDER_PATH""config" ]; then
+        echo "Skipping:" $dir
+    else
+        rm -rfv $dir
+    fi
+done