Move matrix env vars into the right section