I've written a tentative proposal for addressing the issue of catalog breakage on cloud VMs:

https://phabricator.wikimedia.org/T227029

please subscribe and comment if you are interested.  There's context about our current use-cases in the parent ticket, https://phabricator.wikimedia.org/T226270