diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 0e7c125c5a711238f41d1ee70fe195810e2b3338..d6c6c03684f9531197de48e5f007fdaa85e32a85 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -1,3 +1,3 @@
 include:
   - project: tecnalia_robotics-public/gitlab_templates
-    file: ci-templates/auto-rules/kinetic-default.yml
\ No newline at end of file
+    file: ci-templates/auto-rules/kinetic-default.yml
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 2413c176139545a6452088171e3408e4bdc68f51..3cd28f65308bc0815309a7e26835dad9ae9961f4 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -1,3 +1,3 @@
 include:
   - project: tecnalia_robotics-public/gitlab_templates
-    file: ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
\ No newline at end of file
+    file: ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
diff --git a/ci-templates/auto-rules/kinetic-default.yml b/ci-templates/auto-rules/kinetic-default.yml
index 7bc72b9f61cac51b8c82d1cefc110f9ffb56b8f4..85b181a172cb7a15bb9d293ae10e09b9eb9a1657 100644
--- a/ci-templates/auto-rules/kinetic-default.yml
+++ b/ci-templates/auto-rules/kinetic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/no-default.yml
+include: ci-templates/auto-rules/no-default.yml
 
 variables:
-  DEFAULT_DISTRO: kinetic
\ No newline at end of file
+  DEFAULT_DISTRO: kinetic
diff --git a/ci-templates/auto-rules/melodic-default.yml b/ci-templates/auto-rules/melodic-default.yml
index 62379b9842fb149f647c8bf09d98a7dad52142ce..cd5577fbc2de25092c93258e06a1518c071b5df2 100644
--- a/ci-templates/auto-rules/melodic-default.yml
+++ b/ci-templates/auto-rules/melodic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/no-default.yml
+include: ci-templates/auto-rules/no-default.yml
 
 variables:
-  DEFAULT_DISTRO: melodic
\ No newline at end of file
+  DEFAULT_DISTRO: melodic
diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml
index a2f6a982abaa0c1dbe538c8fe0efb8894abecf77..7db60c85ce87b5d9d5eaff4e31364303e66a15d8 100644
--- a/ci-templates/auto-rules/no-default.yml
+++ b/ci-templates/auto-rules/no-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/core.yml
+include: ci-templates/core.yml
 
 workflow:
   rules:
@@ -60,7 +60,6 @@ industrial_ci_noetic:
     - if: $BUILD_NOETIC
 
 
-
 industrial_kinetic_deploy:
   extends:
     - industrial_ci_kinetic
diff --git a/ci-templates/auto-rules/noetic-default.yml b/ci-templates/auto-rules/noetic-default.yml
index f35658b109e54290e175c2261a4b0080447da716..367426075c2d8230f85f39624d5717e8c204e1c6 100644
--- a/ci-templates/auto-rules/noetic-default.yml
+++ b/ci-templates/auto-rules/noetic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/no-default.yml
+include: ci-templates/auto-rules/no-default.yml
 
 variables:
-  DEFAULT_DISTRO: noetic
\ No newline at end of file
+  DEFAULT_DISTRO: noetic
diff --git a/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml b/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
index fe99b53ba9ea0be123a9ffc3ff8ad81a9a4d1c11..d9b2e2ded4565af7f5295f148395ea2dce72bcd6 100644
--- a/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
+++ b/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+include: ci-templates/auto-rules/with-rosinstall/no-default.yml
 
 variables:
-  DEFAULT_DISTRO: kinetic
\ No newline at end of file
+  DEFAULT_DISTRO: kinetic
diff --git a/ci-templates/auto-rules/with-rosinstall/melodic-default.yml b/ci-templates/auto-rules/with-rosinstall/melodic-default.yml
index 47e501baf36a48dfbefac53d72534767163e3b3e..d3946e743affb52a91c254fc61c808547b656060 100644
--- a/ci-templates/auto-rules/with-rosinstall/melodic-default.yml
+++ b/ci-templates/auto-rules/with-rosinstall/melodic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+include: ci-templates/auto-rules/with-rosinstall/no-default.yml
 
 variables:
-  DEFAULT_DISTRO: melodic
\ No newline at end of file
+  DEFAULT_DISTRO: melodic
diff --git a/ci-templates/auto-rules/with-rosinstall/no-default.yml b/ci-templates/auto-rules/with-rosinstall/no-default.yml
index f4735f5718b80fdd0b79dcdca8199673c142a4b6..5ffe30c97c3ad39aa849cf1d78ec392a81caeacf 100644
--- a/ci-templates/auto-rules/with-rosinstall/no-default.yml
+++ b/ci-templates/auto-rules/with-rosinstall/no-default.yml
@@ -1,6 +1,6 @@
-include : ci-templates/auto-rules/no-default.yml
+include: ci-templates/auto-rules/no-default.yml
 
 
 .industrial_ci:
   variables:
-    UPSTREAM_WORKSPACE: .rosinstall
\ No newline at end of file
+    UPSTREAM_WORKSPACE: .rosinstall
diff --git a/ci-templates/auto-rules/with-rosinstall/noetic-default.yml b/ci-templates/auto-rules/with-rosinstall/noetic-default.yml
index 0d83acda446e007ebb7e4336a9b53a9ed4636ec1..728ebde02d7ab274948d0cebd068db92c2b2ca5f 100644
--- a/ci-templates/auto-rules/with-rosinstall/noetic-default.yml
+++ b/ci-templates/auto-rules/with-rosinstall/noetic-default.yml
@@ -1,4 +1,4 @@
-include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+include: ci-templates/auto-rules/with-rosinstall/no-default.yml
 
 variables:
-  DEFAULT_DISTRO: noetic
\ No newline at end of file
+  DEFAULT_DISTRO: noetic
diff --git a/ci-templates/core.yml b/ci-templates/core.yml
index 859514fed173341feaea9cd77dd6b7e4a9e1c368..3553a10a7b6d2f7d0f63accff1e0393b9dddc139 100644
--- a/ci-templates/core.yml
+++ b/ci-templates/core.yml
@@ -1,4 +1,3 @@
-
 image: tecnalia-docker-dev.artifact.tecnalia.com/docker:git
 
 
@@ -22,10 +21,10 @@ 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 :
+include:
   - ci-templates/syntax-check.yml
   - ci-templates/industrial-ci-templates.yml
 
 default:
   tags:
-  - docker
\ No newline at end of file
+    - docker
diff --git a/ci-templates/examples/manual_job.yml b/ci-templates/examples/manual_job.yml
index 8cf4e1d377becdd725bf22ed91cbf05638fc0a74..7a4fa8f456d36e4b7253771b7d44bf9904d30cc8 100644
--- a/ci-templates/examples/manual_job.yml
+++ b/ci-templates/examples/manual_job.yml
@@ -6,4 +6,4 @@ industrial_ci_kinetic:
   extends: .industrial-ci
   variables:
     ROS_DISTRO: kinetic
-    UPSTREAM_WORKSPACE: .rosinstall
\ No newline at end of file
+    UPSTREAM_WORKSPACE: .rosinstall
diff --git a/ci-templates/examples/simple_include.yml b/ci-templates/examples/simple_include.yml
index 3b1a85dd85aa9387ef7b436e45e221b8928f6c25..bd726f780f7bf2035b15b52f46e7d7c19c25e4cc 100644
--- a/ci-templates/examples/simple_include.yml
+++ b/ci-templates/examples/simple_include.yml
@@ -1,3 +1,3 @@
 include:
   - project: tecnalia_robotics-public/gitlab_templates
-    file: ci-templates/core.yml
\ No newline at end of file
+    file: ci-templates/core.yml
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index 9f2516f5a719cbabb7d93dc82ce22c3148ffc57e..b1c5d84ffcc3ff45a8cc0fb800e1dd7a08a84228 100644
--- a/ci-templates/industrial-ci-templates.yml
+++ b/ci-templates/industrial-ci-templates.yml
@@ -1,4 +1,3 @@
-
 .industrial_ci:
   stage: build
   before_script: