diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49a3cd4cecec0faed1186614939c0bf980f5bcce..3d872f628da12898f872b41465d9794dfc5c0684 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,13 +15,21 @@ include:
     rules:
       - if: '$CI_COMMIT_REF_NAME == "develop"'
 
+  - project: osl/code/org.etsi.osl.main
+    ref: $CI_COMMIT_REF_NAME
+    file: 
+      - ci-templates/default.yml
+      - ci-templates/build.yml
+    rules:
+      - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
+
   - 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"'
+      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'
 
 maven_build:
   extends: .maven_build
diff --git a/pom.xml b/pom.xml
index d2c577adcf13a70f2840cfd50b4b7acff2a650b7..ba95f4f6387e0a18f39c78612ede7a31a1c56007 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.etsi.osl</groupId>
 		<artifactId>org.etsi.osl.main</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0</version>
 		<relativePath>../org.etsi.osl.main</relativePath>
 	</parent>
 
diff --git a/src/main/java/org/etsi/osl/model/nfv/ConstituentVxF.java b/src/main/java/org/etsi/osl/model/nfv/ConstituentVxF.java
index e8506803ccdd4163615a7fd4c86b0037c23dea93..4f477e6d18f6640ba6ddacd8c2f2763bd944006e 100644
--- a/src/main/java/org/etsi/osl/model/nfv/ConstituentVxF.java
+++ b/src/main/java/org/etsi/osl/model/nfv/ConstituentVxF.java
@@ -52,7 +52,7 @@ public class ConstituentVxF {
 	@Basic()
 	private String vnfdidRef;
 	
-	@ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.DETACH } )
+	@ManyToOne(cascade = { CascadeType.DETACH } )
 	@JoinColumn(name = "vxf_id")
 	private VxFMetadata vxfref;