Cleanup setup recipes, add more variables and ensure packages are deployed properly.