diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97c24b7..43ecfd8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,4 @@
-stages:
-    - validation
-    - build
-    - prepare
-    - deploy
-    - test
-    - release
-    - publish
+---
 
 variables:
     GIT_SUBMODULE_STRATEGY: recursive
@@ -16,16 +9,9 @@ include:
   - project: nofusscomputing/projects/gitlab-ci
     ref: development
     file:
-      # ToDo: on merge of https://gitlab.com/nofusscomputing/projects/gitlab-ci/-/issues/30
-      # remove lines with mark '1'
-      # uncomment lines with mark '2'
-      # also remove jobs from this ci that are part of the automagic template.
-      - conventional_commits/.gitlab-ci.yml # 1
-      - mkdocs/.gitlab-ci.yml # 1
-      - lint/markdown.gitlab-ci.yaml # 1
-      - gitlab_release/.gitlab-ci.yml # 1
-      # - .gitlab-ci_common.yaml # 2
-      # - template/automagic.gitlab-ci.yaml # 2
+      - .gitlab-ci_common.yaml
+      - template/automagic.gitlab-ci.yaml
+
 
 Website.Lint:
     extends: .Lint_Markdown
@@ -259,10 +245,3 @@ public_website:
       allow_failure: true
     - when: never
 
-
-
-Gitlab Release:
-    extends:
-        - .gitlab_release
-
-
diff --git a/gitlab-ci b/gitlab-ci
index e32db8d..3383d5a 160000
--- a/gitlab-ci
+++ b/gitlab-ci
@@ -1 +1 @@
-Subproject commit e32db8dcfd916bac6f96ef9db8f4dd1ea2c0f261
+Subproject commit 3383d5a086915a8865b4f177bf44dc2c9a2917de