Revert to kk-sam builder