In 2016, Hirt again competed in the Tour of Austria where he won the fourth stage to move into the lead of the GC. He started the next stage with a 1:17 lead over second-placed Guillaume Martin, a gap which he held to the end of the competition three days later. He also competed in the Abu Dhabi Tour, Tour de Suisse, Tour of Turkey, Volta a Catalunya, and the Il Lombardia, where he again did not finish. In 2017, Hirt competed in his first Grand Tour, the Giro d'Italia where he placed 12th in the GC. He also competed in the Tour de Suisse, Tour de Pologne, and the Volta a Catalunya and in August signed a two-year deal with for the 2018 season. Cyclingnews.com described Hirt as a "key GC addition" to the team.
