WHT-31 - Fix the issue with unicorn service