diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28f7775051650ab31b714a5d13416732fba41467..b122fd9e4a842934ea2beaa4f36d113de66e04f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,32 +1,24 @@
 include:
-  - project: 'to-be-continuous/tools/gitlab-ci'
-    ref: 'master'
-    file: '/templates/extract.yml'
-  - project: 'to-be-continuous/tools/gitlab-ci'
-    ref: 'master'
-    file: '/templates/validation.yml'
-  - project: 'to-be-continuous/kicker'
-    ref: 'master'
-    file: '/templates/validation.yml'
-  - project: 'to-be-continuous/bash'
-    ref: '3.4'
-    file: '/templates/gitlab-ci-bash.yml'
-  - project: 'to-be-continuous/semantic-release'
-    ref: '3.11'
-    file: '/templates/gitlab-ci-semrel.yml'
-  - project: 'to-be-continuous/gitleaks'
-    ref: '2.6'
-    file: '/templates/gitlab-ci-gitleaks.yml'
-  
-
-stages:
-  - build
-  - test
-  - publish
+  - project: "to-be-continuous/tools/gitlab-ci"
+    ref: "master"
+    file: "/templates/extract.yml"
+  - project: "to-be-continuous/tools/gitlab-ci"
+    ref: "master"
+    file: "/templates/validation.yml"
+  - project: "to-be-continuous/kicker"
+    ref: "master"
+    file: "/templates/validation.yml"
+  - project: "to-be-continuous/bash"
+    ref: "3.4"
+    file: "/templates/gitlab-ci-bash.yml"
+  - component: $CI_SERVER_FQDN/to-be-continuous/bash/gitlab-ci-bash@3.4
+    inputs:
+      shellcheck-files: "*.sh"
+  - component: $CI_SERVER_FQDN/to-be-continuous/gitleaks/gitlab-ci-gitleaks@2.6
+  - component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel@3.11
 
 variables:
   GITLAB_CI_FILES: "templates/gitlab-ci-python.yml"
-  BASH_SHELLCHECK_FILES: "*.sh"
 
 semantic-release:
   rules: