Fix matrix builds not picking up on sub builds