Reverting to previous deployment model until switch to custom ECs