diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..18e0625c532c97afeb4c53d55c85987b8881e48f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,26 @@
+include:
+  - project: osl/code/org.etsi.osl.main
+    ref: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
+    only:
+      - main
+      - develop
+
+  - project: osl/code/org.etsi.osl.main
+    ref: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build_unprotected.yml
+    except:
+      - main
+      - develop
+
+maven_build:
+  extends: .maven_build
+
+docker_build:
+  extends: .docker_build
+  needs:
+    - maven_build
diff --git a/Dockerfile.oasapi b/Dockerfile
similarity index 100%
rename from Dockerfile.oasapi
rename to Dockerfile