[backport-1.7]: Use short names as much as possible to reach internal services

A solution for issue #3611 (closed) needs to be backported to 1.7.x