Added workflow services
Remove tmp service
Enhance workflow
Merge remote-tracking branch 'origin/master'