Too big of a change for now, I think we should do this when/if we move to GH package registry (we would have to I think).