diff --git a/compose/deploy.sh b/compose/deploy.sh
index d8ac5383db45435b482eb5355c904f8a5565059c..fc6da1c71ac158e8b586604c583bd3061175783c 100644
--- a/compose/deploy.sh
+++ b/compose/deploy.sh
@@ -43,6 +43,7 @@ updaterepo org.etsi.osl.osom
 updaterepo org.etsi.osl.oas
 updaterepo org.etsi.osl.tmf.api
 updaterepo org.etsi.osl.cridge
+updaterepo org.etsi.osl.metrico
 
 updaterepo org.etsi.osl.tmf.web
 updaterepo org.etsi.osl.portal.web
diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure
index ce1ebc0e978326442686c2a93bd11a61b33605ed..0638cbc4cf3d6de54b8b22bdae3c4b87d3ef2aa3 100644
--- a/compose/docker-compose.yaml.configure
+++ b/compose/docker-compose.yaml.configure
@@ -86,7 +86,7 @@ services:
     build:
         context:  ../../org.etsi.osl.portal.api/
         dockerfile: Dockerfile        
-    image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "origins": "http://localhost",
@@ -134,7 +134,7 @@ services:
     build:
         context:  ../../org.etsi.osl.mano/
         dockerfile: Dockerfile        
-    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop
     environment:
        SPRING_APPLICATION_JSON: '{
         "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -160,7 +160,7 @@ services:
     build:
         context:  ../../org.etsi.osl.bugzilla/
         dockerfile: Dockerfile        
-    image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -186,7 +186,7 @@ services:
     build:
         context:  ../../org.etsi.osl.tmf.api/
         dockerfile: Dockerfile      
-    image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "origins": "http://localhost",
@@ -234,7 +234,7 @@ services:
     build:
         context:  ../../org.etsi.osl.osom/
         dockerfile: Dockerfile      
-    image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "spring.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1",
@@ -260,7 +260,7 @@ services:
     build:
         context:  ../../org.etsi.osl.oas/
         dockerfile: Dockerfile      
-    image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "origins": "http://localhost",
@@ -302,7 +302,7 @@ services:
     build:
         context:  ../../org.etsi.osl.cridge/
         dockerfile: Dockerfile      
-    image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -331,7 +331,7 @@ services:
     build:
         context:  ../../org.etsi.osl.metrico/
         dockerfile: Dockerfile      
-    image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "spring.datasource.url": "jdbc:mysql://amysql/metricodb?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC",
@@ -376,7 +376,7 @@ services:
     build:
         context:  ../../org.etsi.osl.centrallog.service/
         dockerfile: Dockerfile        
-    image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml
index ba45552be15c1de84c7e87548b52b0985b7b0d9a..ee1f4f732b9ab57a796ff0d3e2725e0dbb21c5a5 100644
--- a/kubernetes/helm/openslice/values.yaml
+++ b/kubernetes/helm/openslice/values.yaml
@@ -19,12 +19,12 @@ image:
     repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   centrallog:
     repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   keycloak:
     repository: quay.io/keycloak/keycloak
     pullPolicy: Always
@@ -39,22 +39,22 @@ image:
     repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   osom:
     repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   portalapi:
     repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   osscapi:
     repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   mysql:
     repository: mysql
     pullPolicy: Always
@@ -64,27 +64,27 @@ image:
     repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   portalweb:
     repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   tmfweb:
     repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   cridge:
     repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   metrico:
     repository: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
 
 bugzillaurl: example.com:443/bugzilla
 bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
diff --git a/pom.xml b/pom.xml
index bfa0fc3e38a54253ce40a2a03ce7f78502c673d6..4f9205a8a398300716cb16ba6dedf6923fa1c2e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.etsi.osl</groupId>
 	<artifactId>org.etsi.osl.main</artifactId>
-	<version>2024Q4</version>
+	<version>2025Q2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>org.etsi.osl.main</name>
@@ -33,24 +33,24 @@
 		<springdoc-openapiui-version>1.7.0</springdoc-openapiui-version>
 
 		<!-- osl components -->
-		<org.etsi.osl.bugzilla.version>1.0.1</org.etsi.osl.bugzilla.version>
-		<org.etsi.osl.centrallog.client.version>1.0.1</org.etsi.osl.centrallog.client.version>
-		<org.etsi.osl.centrallog.service.version>1.0.1</org.etsi.osl.centrallog.service.version>
-		<org.etsi.osl.cridge.version>1.1.0</org.etsi.osl.cridge.version>
-		<org.etsi.osl.main.version>2024Q4</org.etsi.osl.main.version>
-		<org.etsi.osl.mano.version>1.0.1</org.etsi.osl.mano.version>
-		<org.etsi.osl.model.k8s.version>1.1.0</org.etsi.osl.model.k8s.version>
-		<org.etsi.osl.model.nfv.version>1.0.1</org.etsi.osl.model.nfv.version>
-		<org.etsi.osl.model.tmf.version>1.1.0</org.etsi.osl.model.tmf.version>
-		<org.etsi.osl.oas.version>1.0.1</org.etsi.osl.oas.version>
-		<org.etsi.osl.osom.version>1.1.0</org.etsi.osl.osom.version>
-		<org.etsi.osl.portal.api.version>1.0.1</org.etsi.osl.portal.api.version>
-		<org.etsi.osl.portal.web.version>1.0.1</org.etsi.osl.portal.web.version>
-		<org.etsi.osl.sol005nbi.osm.version>1.0.1</org.etsi.osl.sol005nbi.osm.version>
-		<org.etsi.osl.sol005nbi.osm10.version>1.0.1</org.etsi.osl.sol005nbi.osm10.version>
-		<org.etsi.osl.tmf.api.version>1.1.0</org.etsi.osl.tmf.api.version>
-		<org.etsi.osl.tmf.web.version>1.1.0</org.etsi.osl.tmf.web.version>
-		<org.etsi.osl.metrico.version>0.9</org.etsi.osl.metrico.version>
+		<org.etsi.osl.bugzilla.version>1.0.2-SNAPSHOT</org.etsi.osl.bugzilla.version>
+		<org.etsi.osl.centrallog.client.version>1.0.2-SNAPSHOT</org.etsi.osl.centrallog.client.version>
+		<org.etsi.osl.centrallog.service.version>1.0.2-SNAPSHOT</org.etsi.osl.centrallog.service.version>
+		<org.etsi.osl.cridge.version>1.2.0-SNAPSHOT</org.etsi.osl.cridge.version>
+		<org.etsi.osl.main.version>2025Q2-SNAPSHOT</org.etsi.osl.main.version>
+		<org.etsi.osl.mano.version>1.0.2-SNAPSHOT</org.etsi.osl.mano.version>
+		<org.etsi.osl.model.k8s.version>1.1.1-SNAPSHOT</org.etsi.osl.model.k8s.version>
+		<org.etsi.osl.model.nfv.version>1.0.2-SNAPSHOT</org.etsi.osl.model.nfv.version>
+		<org.etsi.osl.model.tmf.version>1.2.0-SNAPSHOT</org.etsi.osl.model.tmf.version>
+		<org.etsi.osl.oas.version>1.0.2-SNAPSHOT</org.etsi.osl.oas.version>
+		<org.etsi.osl.osom.version>1.2.0-SNAPSHOT</org.etsi.osl.osom.version>
+		<org.etsi.osl.portal.api.version>1.0.2-SNAPSHOT</org.etsi.osl.portal.api.version>
+		<org.etsi.osl.portal.web.version>1.0.2-SNAPSHOT</org.etsi.osl.portal.web.version>
+		<org.etsi.osl.sol005nbi.osm.version>1.0.2-SNAPSHOT</org.etsi.osl.sol005nbi.osm.version>
+		<org.etsi.osl.sol005nbi.osm10.version>1.0.2-SNAPSHOT</org.etsi.osl.sol005nbi.osm10.version>
+		<org.etsi.osl.tmf.api.version>1.2.0-SNAPSHOT</org.etsi.osl.tmf.api.version>
+		<org.etsi.osl.tmf.web.version>1.2.0-SNAPSHOT</org.etsi.osl.tmf.web.version>
+		<org.etsi.osl.metrico.version>1.0.0-SNAPSHOT</org.etsi.osl.metrico.version>
 
 
 		<!-- mainly for gw api -->