diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db0ad64b4974539df266698dcb0057eae0580458..8ea78d6c6187dd518ec9fb389aae2a666ba82c86 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,32 @@
-stages:
-  - deploy
+include:
+  - project: osl/code/org.etsi.osl.main
+    ref: main
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
+    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"'
 
-deploy:
-  stage: deploy
-  image: maven:3.9.5-ibm-semeru-17-focal
-  script:
-    - mvn deploy -s ci_settings.xml -DskipTests
+  - project: osl/code/org.etsi.osl.main
+    ref: develop
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build_unprotected.yml
+    rules:
+      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
+
+maven_build:
+  extends: .maven_build
+
+docker_build:
+  extends: .docker_build
+  needs:
+    - maven_build
diff --git a/Dockerfile.tmfapi b/Dockerfile
similarity index 81%
rename from Dockerfile.tmfapi
rename to Dockerfile
index 7fbc6c2234ecb00b1d02c79d2d6e45baeed49756..0d36bebfba4211f93135f2c7121da6a3fad9ad28 100644
--- a/Dockerfile.tmfapi
+++ b/Dockerfile
@@ -1,6 +1,5 @@
 FROM ibm-semeru-runtimes:open-17.0.7_7-jdk
-MAINTAINER openslice.io
-RUN mkdir /opt/shareclasses
+# RUN mkdir /opt/shareclasses
 RUN mkdir -p /opt/openslice/lib/
 COPY target/org.etsi.osl.tmf.api-1.2.0-SNAPSHOT-exec.jar /opt/openslice/lib/
 CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.tmf.api-1.2.0-SNAPSHOT-exec.jar"]