Another attempt to tweak main.yml