noticed we have gap between whats in yaml and database. this is change aligned to database