On Twitter, Waititi posted: "This is what happens when you hire me to make a superhero movie. I tried to warn them!"
The Hunt For The Wilderpeople director was reportedly brought onto the project to help inject some humour into the ensemble superhero movie.
If his short film is anything to go by, it looks like Waititi may have succeeded.
Showing off his comedic chops, Hemsworth gave fans insight as to what Thor was doing while Captain America and Iron Man were going head to head in Civil War.
As it turns out, he was hanging out in Australia teaching primary school classes, sending emails (with the help of Darrel), trying to string clues together and meeting up with The Hulk for a casual coffee.
Actor Mark Ruffalo, who stars as Bruce Banner/The Hulk in the Marvel franchise, makes a cameo in the video, pondering over how he always wakes up in cut-offs after transforming into the Hulk. He also takes a call from Tony Stark.
After not being asked to join a side, Thor then resolves to start his own team, Team Thor.
Thor: Ragnarok won't be released until the end of 2017, so Waititi's Team Thor video - which was originally shown at Comic-Con in July - will definitely help tide fans over until then.
Fans on Twitter have already reacted positively to Waititi's video:
