Add AWS_STACK_NAME support