ci: improving ci cd templates

Daniel Perezrequested to merge
slb/dperez50/improving-ci-cd-templates into master

Renaming variable to avoid duplication when other service added

Merge request reports