Second attempt at new deployment setup