Rework environment variables

I'm not 100% sure what you were trying to achieve with your matrix configuration, but I toned it down to just be two environment variables at the moment.