Add postfix config
Reorganize YAML a bit