The Arizona Diamondbacks and right-handed starter Merrill Kelly have agreed to a two-year extension with a club option for 2025, the team announced Friday.

Kelly will earn $8 million each year plus a $1-million signing bonus, according to Nick Piecoro of The Arizona Republic. The team option is worth $7 million with a $1-million buyout, pushing the guaranteed value of the deal to $18 million total over two years. If the third-year option is exercised, Kelly will make $24 million.

Kelly, 33, originally signed a four-year, $14.5-million deal with the Diamondbacks before the 2019 season after spending four years in the Korean Baseball Organization. In the first three years of the deal, the veteran starter posted a 4.27 ERA and 4.30 FIP over 372 2/3 innings while making 64 starts.