diff --git a/ci-templates/core.yml b/ci-templates/core.yml
index 8cacbee4740fe12f8807ca502a800f8fd3b1748f..790f9bd07daec3f6b034da7fce93c2d71fa2b795 100644
--- a/ci-templates/core.yml
+++ b/ci-templates/core.yml
@@ -10,18 +10,11 @@ variables:
   TMPDIR: /builds/${CI_PROJECT_NAMESPACE}
   GIT_LFS_SKIP_SMUDGE: 1 # Avoid fetching the files from LFS when doing git fetch
 
-services:
-  - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
-    alias: docker
 
 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 d3e3011e3b4323b6bde4673a8e0b6591432f53ec..a6c0b0f51814e300405137e87dcbf5928b802af1 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -3,6 +3,9 @@ variables:
 
 .industrial_ci:
   stage: build
+  services:
+    - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
+      alias: docker
   before_script:
     - apk add --update bash coreutils tar
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config
@@ -19,6 +22,9 @@ variables:
 
 .ddeploy:
   stage: deploy
+  services:
+  - name: tecnalia-docker-dev.artifact.tecnalia.com/docker:dind
+    alias: docker
   variables:
     DOCKER_PUSH_REGISTRY: ${ARTIFACT_DOCKER_URL}
     DOCKER_PUSH_NAME: ${CI_PROJECT_PATH}
diff --git a/ci-templates/syntax-check.yml b/ci-templates/syntax-check.yml
index 2ebc80038b4e66ffee6238f105a6a91cc53baeb4..292faf6ab07f6e9aeff793c0e5c2ba6389079ce6 100644
--- a/ci-templates/syntax-check.yml
+++ b/ci-templates/syntax-check.yml
@@ -6,6 +6,9 @@ variables:
 ##########################################################
 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
@@ -53,7 +56,9 @@ bash_syntax:
 ##########################################################
 markdown_syntax:
   stage: .post
-  script: docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
+  image: tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci
+  script:
+    - syntax-markdown --path=${PWD} --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014"
   when: always
 
 ##########################################################
@@ -64,10 +69,11 @@ markdown_syntax:
 ##########################################################
 file_syntax:
   stage: .post
+  image: tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci
   script:
     - RET=0
-    - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
-    - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-utf8 --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+    - file-trailing-space --path=${PWD} --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
+    - file-utf8 --path=${PWD} --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1
     - exit $RET
   when: always