Rebuild with newer cake3, move to uru3