Refactor tracking code in container registry

Currently the tracking code in the container registry is not using the Tracking mixin in some part and in general is using an older approach.

We should refactor the code so that the mixin is used.