more cf.yaml tweaks