HAMA-681: fix the work flow