Update build for g6