[*] Update devkit logic