Attempt to properly set AWS env vars

[#45783737]