Tooling api infrastructure closes the services correctly.
After bumping artifact layout, one more change is needed.