Break up apt packages and other make stuff. Fix deploy inc. secrets.