Both Glasgow giants are set to renew hostilities on a fairly regular basis next season after Rangers won promotion back to the Scottish Premiership.
It has been four years since both Old Firm enemies squared off in a league outing after Rangers were forced to slug it out in the lower divisions since 2012.
But Griffiths admits that he is looking forward to their return, suggesting that he plans to inflict serious damage on them over the next few years - unless the Gers are relegated, or worse.
"My aim is to score more Old Firm goals. I’m here for another four years – and hopefully even more after that," Griffiths, who has faced Rangers twice and scored once, said via The Glasgow Evening Times.
“So hopefully, if Rangers are still in the league over that time and we’ll have 16 derbies in four years.”
Even the most ardent of Celtic fans might admit that the Gers don't look like they were going anywhere at the moment. In fact, the consensus seems to be that manager Mark Warburton is building a title-challenging team for next season.
Warburton has drafted in eight new signing so far - including the likes of Joey Barton and Niko Kranjcar.
He has also signed some well-thought of young players who can safeguard the club's status in the top flight over the coming years, such as Josh Windass and Matt Crooks.
Celtic, under Brendan Rodgers, will be aiming for a sixth straight Premiership title next term.