Added environment conditional for aws keys