Make env keys global instead of matrix