AMI-396 more yaml tweaks