Fixed preselection and build deliverable