Qschneider updated yamls

[qschneider]

Proposed changes of yaml files to reflect current state of main branch

[jensgraef]

Thanks - this makes the configuration files more complete and cleaner!