diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18e0625c532c97afeb4c53d55c85987b8881e48f..8ea78d6c6187dd518ec9fb389aae2a666ba82c86 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,27 @@
 include:
   - project: osl/code/org.etsi.osl.main
-    ref: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main
+    ref: main
     file: 
       - ci-templates/default.yml
       - ci-templates/build.yml
-    only:
-      - main
-      - develop
+    rules:
+      - if: '$CI_COMMIT_REF_NAME == "main"'
+  
+  - project: osl/code/org.etsi.osl.main
+    ref: develop
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
+    rules:
+      - if: '$CI_COMMIT_REF_NAME == "develop"'
 
   - project: osl/code/org.etsi.osl.main
-    ref: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main
+    ref: develop
     file: 
       - ci-templates/default.yml
       - ci-templates/build_unprotected.yml
-    except:
-      - main
-      - develop
+    rules:
+      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
 
 maven_build:
   extends: .maven_build