Workflows consolidated fixes classifier

Rebased pull request from @GiorgosPa

I dont like the idea on relying to the doc string.