Improved upstream dependency configuration and resolution