refactoring into common.yml