Hotfix: support AWS creds in environment vars