Third attempt at new deployment setup