Start use env matrix
Remove --non-recursive option