diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index d959da18d1fbfc8bcb0c79afd4fe84a366157975..6dad8ca78426e8a4838447a85fcda6c41cb11888 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -10,7 +10,8 @@
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
     ADDITIONAL_DEBS: curl
     PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM
-    AFTER_SETUP_TARGET_WORKSPACE: "rosenv && bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$current_ws"
+    GITLAB_TEMPLATES_BRANCH: master
+    AFTER_SETUP_TARGET_WORKSPACE: "rosenv && bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/ci_run_entry_points.sh) $$current_ws"
     CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
 
 
diff --git a/ci-templates/syntax-check.yml b/ci-templates/syntax-check.yml
index 4ecbab1babd74ebe91e994d87927962bca9986c2..53bc4036469c6c7a1927aad012b9abee600481e0 100644
--- a/ci-templates/syntax-check.yml
+++ b/ci-templates/syntax-check.yml
@@ -7,12 +7,13 @@ clang_format:
   before_script:
     - apk add --update bash coreutils tar wget
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
-    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/clang-format -O .clang-format
+    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/clang-format -O .clang-format
   script: .ci_config/gitlab.sh
   variables:
     ROS_DISTRO: kinetic
     CLANG_FORMAT_CHECK: file
     CLANG_FORMAT_VERSION: "3.8"
+    GITLAB_TEMPLATES_BRANCH: master
   when: always
 
 ##########################################################
@@ -77,8 +78,10 @@ file_syntax:
 adoc_syntax:
   stage: .post
   image: tecnalia-docker-dev.artifact.tecnalia.com/alpine
+  variables:
+    GITLAB_TEMPLATES_BRANCH: master
   before_script:
     - apk add --update curl asciidoctor bash
   script:
-    - curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/asciidoctor_syntax_check.bash | bash -s -- .
+    - curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/asciidoctor_syntax_check.bash | bash -s -- .
   when: always