Re-enable matrix build so I dont forget to do it manualy after merge