diff --git a/tools/cleanup-host b/tools/cleanup-host
index b0917e1e30..d9ea768087 100755
--- a/tools/cleanup-host
+++ b/tools/cleanup-host
@@ -68,7 +68,9 @@ for dir in $FOLDER_PATH*; do
     if [ "$dir" == "$FOLDER_PATH""passwords.yml" ] || \
        [ "$dir" == "$FOLDER_PATH""globals.yml" ] || \
        [ "$dir" == "$FOLDER_PATH""kolla-build.conf" ] || \
-       [ "$dir" == "$FOLDER_PATH""config" ]; then
+       [ "$dir" == "$FOLDER_PATH""config" ] || \
+       [ "$dir" == "$FOLDER_PATH""kolla-cli" ] || \
+       [ "$dir" == "$FOLDER_PATH""certificates" ]; then
         echo "Skipping:" $dir
     else
         rm -rfv $dir