Migrate to new Tribble build