Chore/84899842/make and kill build zombies