Moved setting env variables to dedicated section