Developed advanced BGP set-nexthop-peer support for the Vibhu-gslab/avd repository’s EOS CLI configuration generator, enabling more flexible and robust BGP peering scenarios. The work involved introducing new parameters and options for next-hop peer settings, allowing users to define complex BGP configurations through Ansible-driven automation. Leveraging Python, Jinja2, and YAML, the implementation maintained compatibility with existing workflows and ensured no regressions in integration. All changes were clearly documented and traceable to the relevant ticket, reflecting a disciplined approach to feature delivery. This contribution enhanced the repository’s capabilities for network engineers working with automated BGP configuration management.