[Backport 6.6.x] fix: update internal registry from legacy to new revamp registry

[Backport 6.6.x] fix: update internal registry from legacy to new revamp registry #2381