diff --git a/ci-templates/core.yml b/ci-templates/core.yml
index b333e000269bce7a056a91d0178386a31e0ab77b..42589fe5a99a7a4aa778ffe637e144302f5b0189 100644
--- a/ci-templates/core.yml
+++ b/ci-templates/core.yml
@@ -26,3 +26,6 @@ include :
   - ci-templates/post-check.yml
   - ci-templates/industrial-ci-templates.yml
 
+default:
+  tags:
+  - docker
\ No newline at end of file
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index 839f4ee0ff30466048177bf146a2bcf054305c63..2758faf0aaba733a159da02166b38fd595e72eea 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -14,8 +14,6 @@
     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"
     AFTER_SETUP_UPSTREAM_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"
     CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
-  tags:
-    - docker
 
 
 .industrial_ci_deploy:
diff --git a/ci-templates/post-check.yml b/ci-templates/post-check.yml
index 3124256d93d7cebed0833be0c58199af864a8c7a..ccf1df27eed73b357173f453efb031414b956e53 100644
--- a/ci-templates/post-check.yml
+++ b/ci-templates/post-check.yml
@@ -14,8 +14,6 @@ clang_format:
     CLANG_FORMAT_CHECK: file
     CLANG_FORMAT_VERSION: "3.8"
   when: always
-  tags:
-    - docker
 
 ##########################################################
 ## Simple check for basic Python syntax errors; this is much less thorough than
@@ -27,8 +25,6 @@ python_syntax:
   stage: build
   script: python -m compileall -q .
   when: always
-  tags:
-    - docker
 
 ##########################################################
 ## Check for errors in bash/sh scripts
@@ -44,8 +40,6 @@ bash_syntax:
     - find . -type f -name '*.bash' -exec shellcheck -s bash {} + || RET=1
     - exit $RET
   when: always
-  tags:
-    - docker
 
 ##########################################################
 ## Check for errors in markdown files
@@ -58,8 +52,6 @@ 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"
   when: always
-  tags:
-    - docker
 
 ##########################################################
 ## Check for various syntax issues in files; currently
@@ -75,8 +67,6 @@ file_syntax:
     - 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
     - exit $RET
   when: always
-  tags:
-    - docker
 
 ##########################################################
 ## Check for errors in Asciidoctor files
@@ -90,6 +80,4 @@ adoc_syntax:
     - 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 -- .
-  tags:
-    - docker
   when: always