diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 75393edbd7b547da05db2eefaf179d5983893313..26a2a73ae07840f1ce97d0369802c7986fd1b208 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -1 +1,4 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/kinetic-default.yml'
\ No newline at end of file
+include:
+  - project: tecnalia_robotics-public/gitlab_templates
+    ref: 35-improve-ci-template-organization
+    file: ci-templates/auto-rules/kinetic-default.yml
\ No newline at end of file
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index bddac0ad044ebbcfa47436b961702ff89e62aaf3..57165c5825b26e72630ae597c3092f7472c56cb5 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -1 +1,4 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/kinetic-default.yml'
\ No newline at end of file
+include:
+  - project: tecnalia_robotics-public/gitlab_templates
+    ref: 35-improve-ci-template-organization
+    file: ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
\ No newline at end of file
diff --git a/auto-rules/kinetic-default.yml b/auto-rules/kinetic-default.yml
deleted file mode 100644
index 0c04cd5b092c3cfaef92b395068496c635408868..0000000000000000000000000000000000000000
--- a/auto-rules/kinetic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: kinetic
\ No newline at end of file
diff --git a/auto-rules/melodic-default.yml b/auto-rules/melodic-default.yml
deleted file mode 100644
index 023a8ea82ea6364ad40db1cdf29ce36311d7a293..0000000000000000000000000000000000000000
--- a/auto-rules/melodic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: melodic
\ No newline at end of file
diff --git a/auto-rules/noetic-default.yml b/auto-rules/noetic-default.yml
deleted file mode 100644
index 8239a7164315518a8f4deddedf2e70037825eff1..0000000000000000000000000000000000000000
--- a/auto-rules/noetic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: noetic
\ No newline at end of file
diff --git a/auto-rules/with-rosinstall/kinetic-default.yml b/auto-rules/with-rosinstall/kinetic-default.yml
deleted file mode 100644
index 20f6e8a380d9d67373fe6849c15e628244800bcc..0000000000000000000000000000000000000000
--- a/auto-rules/with-rosinstall/kinetic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: kinetic
\ No newline at end of file
diff --git a/auto-rules/with-rosinstall/melodic-default.yml b/auto-rules/with-rosinstall/melodic-default.yml
deleted file mode 100644
index 69519f9197c8828582ff2c066fb19141a7c74b3e..0000000000000000000000000000000000000000
--- a/auto-rules/with-rosinstall/melodic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: melodic
\ No newline at end of file
diff --git a/auto-rules/with-rosinstall/no-default.yml b/auto-rules/with-rosinstall/no-default.yml
deleted file mode 100644
index ab36dd9b327e671f863f76a248f91c63892a1943..0000000000000000000000000000000000000000
--- a/auto-rules/with-rosinstall/no-default.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/no-default.yml'
-
-
-.industrial_ci:
-  variables:
-    UPSTREAM_WORKSPACE: .rosinstall
\ No newline at end of file
diff --git a/auto-rules/with-rosinstall/noetic-default.yml b/auto-rules/with-rosinstall/noetic-default.yml
deleted file mode 100644
index bf3d10cb520455f5a166c5d4d0f37849b039bc7b..0000000000000000000000000000000000000000
--- a/auto-rules/with-rosinstall/noetic-default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/auto-rules/with-rosinstall/no-default.yml'
-
-variables:
-  DEFAULT_DISTRO: noetic
\ No newline at end of file
diff --git a/ci-templates/auto-rules/kinetic-default.yml b/ci-templates/auto-rules/kinetic-default.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7bc72b9f61cac51b8c82d1cefc110f9ffb56b8f4
--- /dev/null
+++ b/ci-templates/auto-rules/kinetic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: kinetic
\ No newline at end of file
diff --git a/ci-templates/auto-rules/melodic-default.yml b/ci-templates/auto-rules/melodic-default.yml
new file mode 100644
index 0000000000000000000000000000000000000000..62379b9842fb149f647c8bf09d98a7dad52142ce
--- /dev/null
+++ b/ci-templates/auto-rules/melodic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: melodic
\ No newline at end of file
diff --git a/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml
similarity index 94%
rename from auto-rules/no-default.yml
rename to ci-templates/auto-rules/no-default.yml
index 85581fb2da065bdc4bcf9cc8584f7abc0ea06b8c..8596c1b75e78b54e958cea494b7c4fe27c19ff2d 100644
--- a/auto-rules/no-default.yml
+++ b/ci-templates/auto-rules/no-default.yml
@@ -1,4 +1,4 @@
-include : 'https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/-/raw/35-improve-ci-template-organization/core.yml'
+include : ci-templates/core.yml
 
 workflow:
   rules:
diff --git a/ci-templates/auto-rules/noetic-default.yml b/ci-templates/auto-rules/noetic-default.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f35658b109e54290e175c2261a4b0080447da716
--- /dev/null
+++ b/ci-templates/auto-rules/noetic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: noetic
\ No newline at end of file
diff --git a/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml b/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fe99b53ba9ea0be123a9ffc3ff8ad81a9a4d1c11
--- /dev/null
+++ b/ci-templates/auto-rules/with-rosinstall/kinetic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: kinetic
\ No newline at end of file
diff --git a/ci-templates/auto-rules/with-rosinstall/melodic-default.yml b/ci-templates/auto-rules/with-rosinstall/melodic-default.yml
new file mode 100644
index 0000000000000000000000000000000000000000..47e501baf36a48dfbefac53d72534767163e3b3e
--- /dev/null
+++ b/ci-templates/auto-rules/with-rosinstall/melodic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: melodic
\ No newline at end of file
diff --git a/ci-templates/auto-rules/with-rosinstall/no-default.yml b/ci-templates/auto-rules/with-rosinstall/no-default.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f4735f5718b80fdd0b79dcdca8199673c142a4b6
--- /dev/null
+++ b/ci-templates/auto-rules/with-rosinstall/no-default.yml
@@ -0,0 +1,6 @@
+include : ci-templates/auto-rules/no-default.yml
+
+
+.industrial_ci:
+  variables:
+    UPSTREAM_WORKSPACE: .rosinstall
\ No newline at end of file
diff --git a/ci-templates/auto-rules/with-rosinstall/noetic-default.yml b/ci-templates/auto-rules/with-rosinstall/noetic-default.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0d83acda446e007ebb7e4336a9b53a9ed4636ec1
--- /dev/null
+++ b/ci-templates/auto-rules/with-rosinstall/noetic-default.yml
@@ -0,0 +1,4 @@
+include : ci-templates/auto-rules/with-rosinstall/no-default.yml
+
+variables:
+  DEFAULT_DISTRO: noetic
\ No newline at end of file
diff --git a/core.yml b/ci-templates/core.yml
similarity index 76%
rename from core.yml
rename to ci-templates/core.yml
index 6f71cf5aeb7a5ad160a9ad17574bbed16195db33..b333e000269bce7a056a91d0178386a31e0ab77b 100644
--- a/core.yml
+++ b/ci-templates/core.yml
@@ -23,9 +23,6 @@ before_script:
   - docker login tecnalia-docker-dev.artifact.tecnalia.com -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
 
 include :
-  - project: tecnalia_robotics-public/gitlab_templates
-    ref: 35-improve-ci-template-organization
-    file:
-      - post-check.yml
-      - industrial-ci-templates.yml
+  - ci-templates/post-check.yml
+  - ci-templates/industrial-ci-templates.yml
 
diff --git a/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
similarity index 100%
rename from industrial-ci-templates.yml
rename to ci-templates/industrial-ci-templates.yml
diff --git a/post-check.yml b/ci-templates/post-check.yml
similarity index 100%
rename from post-check.yml
rename to ci-templates/post-check.yml