I will test on local but maybe defining repository as services can be better for this case (and for others ^^).
Btw, not a problem to merge this PR. Will see after.