Prepare for next CM11-based SGS build