Added keepBuild flag which defaults to false