Fixed build targets: merge base & prebuild configs