SD-329 Revert to 'upload' and read behave amazon settings from environment