More flexible registration for production deployments