This paper describes the refactoring of INDICATOR to make it more scalable and suitable for One Health monitoring with human, veterinary, and environmental data. We define the new systems architecture and a common data submission structure that can be used by all of our healthcare partners independent of type of facility or species served.