Tasks/dev 51/improve workflow