Do less cding around in the third-party workflow
#637
Merged
cding around in the third-party workflow
#637