diff --git a/ci-templates/core.yml b/ci-templates/core.yml
index d565be5a3f3d2f27b985885a65eb5345ed32b2d3..790f9bd07daec3f6b034da7fce93c2d71fa2b795 100644
--- a/ci-templates/core.yml
+++ b/ci-templates/core.yml
@@ -15,10 +15,6 @@ stages:
   - build
   - deploy
 
-before_script:
-  - apk add --update bash coreutils tar wget
-  - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
-
 include:
   - ci-templates/syntax-check.yml
   - ci-templates/industrial-ci-templates.yml
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index 5e2f16d484b24d2429acd606f043000d0ea50217..ee6d7633682506c4a93684e591dccbd345a675b1 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -1,5 +1,8 @@
 .industrial_ci:
   stage: build
+  before_script:
+    - apk add --update bash coreutils tar wget
+    - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
   services:
     - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
       alias: docker
diff --git a/ci-templates/syntax-check.yml b/ci-templates/syntax-check.yml
index 742db94fe9fd4b976051e41974aeca4736f6a205..1d9ee615394ed2e5d4012f053d03c6ef06a96e0f 100644
--- a/ci-templates/syntax-check.yml
+++ b/ci-templates/syntax-check.yml
@@ -4,6 +4,9 @@
 
 clang_format:
   stage: .post
+  services:
+    - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
+      alias: docker
   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