diff --git a/ci-templates/core.yml b/ci-templates/core.yml
index 8cacbee4740fe12f8807ca502a800f8fd3b1748f..d565be5a3f3d2f27b985885a65eb5345ed32b2d3 100644
--- a/ci-templates/core.yml
+++ b/ci-templates/core.yml
@@ -10,9 +10,6 @@ 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
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index acef8ec4af255986f8e3d52e749fee26a0c0b9b8..5e2f16d484b24d2429acd606f043000d0ea50217 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -1,5 +1,8 @@
 .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
diff --git a/ci-templates/syntax-check.yml b/ci-templates/syntax-check.yml
index 4ecbab1babd74ebe91e994d87927962bca9986c2..742db94fe9fd4b976051e41974aeca4736f6a205 100644
--- a/ci-templates/syntax-check.yml
+++ b/ci-templates/syntax-check.yml
@@ -51,7 +51,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
 
 ##########################################################
@@ -62,10 +64,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