GR: refactored amazon deploy