Fix AWS env vars and add @timestamp field