[devstack] improve