Prepare for new build mechanism

Signed-off-by: kecinzer <kecinzer@gmail.com>