diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b68b302e6d1e7ed89a30f2277c22211467478344..778ddfd27b06c797228f8f44123e28f621abf2cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,8 @@
 shellcheck:
   image: koalaman/shellcheck-alpine
   script: shellcheck deploy/base/ros_entrypoint.bash scripts/*sh
+  tags:
+    - docker
 
 # The ignored rules in hadolint checks are
 # DL3006 Always tag the version of an image explicitly
@@ -16,7 +18,11 @@ dockerfiles:
     - hadolint --ignore DL3006 --ignore DL3008 deploy/base/Dockerfile || RET=1
     - hadolint --ignore DL3006 --ignore DL3008 deploy/dev/Dockerfile || RET=1
     - exit $RET
+  tags:
+    - docker
 
 yamllint:
   image: sdesbure/yamllint
   script: yamllint $(find . -name '*.yml' -o -name '*.yaml')
+  tags:
+    - docker
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index b440e4519bdfee714d710a848d765fcbec3bd506..e0a7f13e5f977fa70eb883a7ccfb2667d021e802 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -30,6 +30,8 @@ before_script:
     BEFORE_SCRIPT: bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE
     CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
   when: always
+  tags:
+    - docker
 
 industrial_ci_kinetic:
   extends: .industrial_ci_kinetic
@@ -66,6 +68,8 @@ python_syntax:
   stage: precheck
   script: python -m compileall -q .
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for errors in bash/sh scripts
@@ -80,6 +84,8 @@ bash_syntax:
     - exit $RET
   allow_failure: yes
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for errors in markdown files
@@ -93,6 +99,8 @@ markdown_syntax:
   script: docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013"
   allow_failure: yes
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for various syntax issues in files; currently
@@ -109,3 +117,5 @@ file_syntax:
     - exit $RET
   allow_failure: yes
   when: always
+  tags:
+    - docker
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index cc58c8c122ddac4f63584c41872afec855f5eaed..229480d0bd3db9e3345cd253f5fc942d67235760 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -32,6 +32,8 @@ before_script:
     BEFORE_SCRIPT: bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE
     CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
   when: always
+  tags:
+    - docker
 
 industrial_ci_kinetic:
   extends: .industrial_ci_kinetic
@@ -68,6 +70,8 @@ python_syntax:
   stage: precheck
   script: python -m compileall -q .
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for errors in bash/sh scripts
@@ -82,6 +86,8 @@ bash_syntax:
     - exit $RET
   allow_failure: yes
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for errors in markdown files
@@ -95,6 +101,8 @@ markdown_syntax:
   script: docker run -v ${PWD}:/ac cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013"
   allow_failure: yes
   when: always
+  tags:
+    - docker
 
 ##########################################################
 ## Check for various syntax issues in files; currently
@@ -111,3 +119,5 @@ file_syntax:
     - exit $RET
   allow_failure: yes
   when: always
+  tags:
+    - docker