Fourth attempt at new deployment setup