add missing @ in service builder for yaml files and simplify string concatenation