Would it make sense to move this to the server container?