Gitlab refactoring