Workflows consolidated fixes classifier

Rebased pull request from @GiorgosPa