Standardizing references to credentials in yaml template
Fixing indentation problem; providing tests for possible missing values that user will need to fill in manually