diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index f36a047f968fc69e74fae55debc1964960efc0dc..b64a68a55cc88378df6656e1c32b9c318407ae9a 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -18,10 +18,9 @@ before_script:
 .industrial_ci:
   stage: build
   before_script:
-    - apk add --update bash coreutils tar wget
+    - apk add --update bash coreutils tar
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
     - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
-    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/clang-format -O .clang-format
   script: .ci_config/gitlab.sh
   variables:
     ADDITIONAL_DEBS: curl
@@ -77,12 +76,19 @@ industrial_ci_kinetic_deploy:
     - tags
 
 clang_format:
-  extends: .industrial_ci
   stage: postcheck
+  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
+    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/clang-format -O .clang-format
+  script: .ci_config/gitlab.sh
   variables:
     ROS_DISTRO: kinetic
     CLANG_FORMAT_CHECK: file
     CLANG_FORMAT_VERSION: "3.8"
+  when: always
+  tags:
+    - docker
   allow_failure: yes
 
 ##########################################################
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index b33136265fe9f631c87d3ace8d0f7ed4cb87ff76..c095ae7182b423b5c0e54c856bccc6d5d6e1cc83 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -18,10 +18,9 @@ before_script:
 .industrial_ci:
   stage: build
   before_script:
-    - apk add --update bash coreutils tar wget
+    - apk add --update bash coreutils tar
     - git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
     - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
-    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/clang-format -O .clang-format
   script: .ci_config/gitlab.sh
   variables:
     ADDITIONAL_DEBS: curl
@@ -79,12 +78,19 @@ industrial_ci_kinetic_deploy:
     - tags
 
 clang_format:
-  extends: .industrial_ci
   stage: postcheck
+  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
+    - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/clang-format -O .clang-format
+  script: .ci_config/gitlab.sh
   variables:
     ROS_DISTRO: kinetic
     CLANG_FORMAT_CHECK: file
     CLANG_FORMAT_VERSION: "3.8"
+  when: always
+  tags:
+    - docker
   allow_failure: yes
 
 ##########################################################