updating timeouts and trials templates for aws