CS-1: Improved buildpack configuration