SAPI-247: Something keeps destroying vm types, leads to "missing" sapi data
SAPI-247: Make sure we fill the correct service types