Fix deploy without multitenancy in place