diff --git a/org/ystia/ansible/linux/ansible/types.yaml b/org/ystia/ansible/linux/ansible/types.yaml
index bf13df7c..a80ba628 100644
--- a/org/ystia/ansible/linux/ansible/types.yaml
+++ b/org/ystia/ansible/linux/ansible/types.yaml
@@ -17,13 +17,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.ansible.linux.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: yorc
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.ansible.pub:2.1.0-SNAPSHOT
+  - org.ystia.ansible.pub:2.1.0-M5
 
 node_types:
   org.ystia.ansible.linux.ansible.nodes.AnsibleRuntime:
diff --git a/org/ystia/ansible/pub/types.yaml b/org/ystia/ansible/pub/types.yaml
index e68a04b7..80287888 100644
--- a/org/ystia/ansible/pub/types.yaml
+++ b/org/ystia/ansible/pub/types.yaml
@@ -17,7 +17,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.ansible.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: yorc
 
 imports:
diff --git a/org/ystia/beats/linux/bash/types.yml b/org/ystia/beats/linux/bash/types.yml
index 7663b6d1..feaf33c4 100644
--- a/org/ystia/beats/linux/bash/types.yml
+++ b/org/ystia/beats/linux/bash/types.yml
@@ -8,16 +8,16 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.beats.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Beats are data shippers for many types of data you want to enrich with Logstash, search and analyze in Elasticsearch, and visualize in Kibana.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.logstash.pub:2.1.0-SNAPSHOT
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.logstash.pub:2.1.0-M5
 
 node_types:
   org.ystia.beats.linux.bash.nodes.Beat:
diff --git a/org/ystia/cloudera/linux/bash/types.yml b/org/ystia/cloudera/linux/bash/types.yml
index 464c0c2e..2858862e 100644
--- a/org/ystia/cloudera/linux/bash/types.yml
+++ b/org/ystia/cloudera/linux/bash/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.cloudera.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Cloudera big data distribution for Linux system
@@ -16,9 +16,9 @@ description: Cloudera big data distribution for Linux system
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.cloudera.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.cloudera.pub:2.1.0-M5
 
 node_types:
   org.ystia.cloudera.linux.bash.nodes.ClouderaServer:
diff --git a/org/ystia/cloudera/pub/types.yml b/org/ystia/cloudera/pub/types.yml
index 0ff123eb..e69df56b 100644
--- a/org/ystia/cloudera/pub/types.yml
+++ b/org/ystia/cloudera/pub/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.cloudera.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for Cloudera support.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
 
 capability_types:
   org.ystia.cloudera.pub.capabilities.ClouderaServerEndpoint:
diff --git a/org/ystia/common/types.yml b/org/ystia/common/types.yml
index d9bccf01..57a8f6f9 100644
--- a/org/ystia/common/types.yml
+++ b/org/ystia/common/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.common
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: common part of all ystia components
diff --git a/org/ystia/consul/linux/bash/types.yml b/org/ystia/consul/linux/bash/types.yml
index 85800f48..31b6595c 100644
--- a/org/ystia/consul/linux/bash/types.yml
+++ b/org/ystia/consul/linux/bash/types.yml
@@ -8,15 +8,15 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.consul.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Consul agent and server
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
 
 node_types:
   org.ystia.consul.linux.bash.nodes.Consul:
diff --git a/org/ystia/consul/pub/types.yml b/org/ystia/consul/pub/types.yml
index dccf06c0..fa361e3e 100644
--- a/org/ystia/consul/pub/types.yml
+++ b/org/ystia/consul/pub/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.consul.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for Consul support.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
 
 node_types:
   org.ystia.consul.pub.nodes.ConsulUser:
diff --git a/org/ystia/dns/dnsmaq/ansible/types.yml b/org/ystia/dns/dnsmaq/ansible/types.yml
index 132a986a..a76f450a 100644
--- a/org/ystia/dns/dnsmaq/ansible/types.yml
+++ b/org/ystia/dns/dnsmaq/ansible/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.dns.dnsmasq.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.dns.pub:2.1.0-SNAPSHOT
+  - org.ystia.dns.pub:2.1.0-M5
 
 node_types:
   org.ystia.dns.dnsmasq.ansible.nodes.Dnsmasq:
diff --git a/org/ystia/dns/pub/types.yml b/org/ystia/dns/pub/types.yml
index 5d5fcc13..f10cc4d9 100644
--- a/org/ystia/dns/pub/types.yml
+++ b/org/ystia/dns/pub/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.dns.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for DNS support.
diff --git a/org/ystia/dns/resolvconf/ansible/types.yml b/org/ystia/dns/resolvconf/ansible/types.yml
index 3bdee251..e997500e 100644
--- a/org/ystia/dns/resolvconf/ansible/types.yml
+++ b/org/ystia/dns/resolvconf/ansible/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.dns.resolvconf.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.dns.pub:2.1.0-SNAPSHOT
+  - org.ystia.dns.pub:2.1.0-M5
 
 node_types:
   org.ystia.dns.resolvconf.ansible.Resolvconf:
diff --git a/org/ystia/docker/ansible/types.yml b/org/ystia/docker/ansible/types.yml
index 49d291bf..8b107c2c 100644
--- a/org/ystia/docker/ansible/types.yml
+++ b/org/ystia/docker/ansible/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.docker.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 imports:
diff --git a/org/ystia/elasticsearch/linux/bash/types.yml b/org/ystia/elasticsearch/linux/bash/types.yml
index 9b3936ae..ede916da 100644
--- a/org/ystia/elasticsearch/linux/bash/types.yml
+++ b/org/ystia/elasticsearch/linux/bash/types.yml
@@ -8,17 +8,17 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.elasticsearch.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Elasticsearch implementation
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
 
 node_types:
   org.ystia.elasticsearch.linux.bash.nodes.Elasticsearch:
diff --git a/org/ystia/elasticsearch/pub/types.yml b/org/ystia/elasticsearch/pub/types.yml
index e29eaff1..a9208a91 100644
--- a/org/ystia/elasticsearch/pub/types.yml
+++ b/org/ystia/elasticsearch/pub/types.yml
@@ -8,15 +8,15 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.elasticsearch.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for Elasticsearch support.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
 
 node_types:
   org.ystia.elasticsearch.pub.nodes.AbstractElasticSearch:
diff --git a/org/ystia/experimental/consul/linux/ansible/types.yaml b/org/ystia/experimental/consul/linux/ansible/types.yaml
index a580a372..d5dfe5ae 100644
--- a/org/ystia/experimental/consul/linux/ansible/types.yaml
+++ b/org/ystia/experimental/consul/linux/ansible/types.yaml
@@ -18,13 +18,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.yorc.experimental.consul.linux.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: yorc
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.yorc.experimental.consul.pub:2.1.0-SNAPSHOT
+  - org.ystia.yorc.experimental.consul.pub:2.1.0-M5
 
 description: >
   This component allows to deploy Consul with Ansible
diff --git a/org/ystia/experimental/consul/pub/types.yaml b/org/ystia/experimental/consul/pub/types.yaml
index 6f46091c..5f0fc605 100644
--- a/org/ystia/experimental/consul/pub/types.yaml
+++ b/org/ystia/experimental/consul/pub/types.yaml
@@ -18,7 +18,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.yorc.experimental.consul.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: yorc
 
 imports:
diff --git a/org/ystia/experimental/consul/topologies/ConsulOnBS/types.yaml b/org/ystia/experimental/consul/topologies/ConsulOnBS/types.yaml
index 04630a79..5ceb155e 100644
--- a/org/ystia/experimental/consul/topologies/ConsulOnBS/types.yaml
+++ b/org/ystia/experimental/consul/topologies/ConsulOnBS/types.yaml
@@ -26,8 +26,8 @@ description: "This topology illustrates how to setup block storage and partition
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - alien-extended-storage-types:2.1.0-SM6
-  - org.ystia.yorc.experimental.consul.linux.ansible:2.1.0-SNAPSHOT
-  - org.ystia.yorc.experimental.consul.pub:2.1.0-SNAPSHOT
+  - org.ystia.yorc.experimental.consul.linux.ansible:2.1.0-M5
+  - org.ystia.yorc.experimental.consul.pub:2.1.0-M5
 
 topology_template:
   node_templates:
diff --git a/org/ystia/experimental/consul/topologies/MultiDCWithWAN/types.yaml b/org/ystia/experimental/consul/topologies/MultiDCWithWAN/types.yaml
index 871f24ac..0b539115 100644
--- a/org/ystia/experimental/consul/topologies/MultiDCWithWAN/types.yaml
+++ b/org/ystia/experimental/consul/topologies/MultiDCWithWAN/types.yaml
@@ -27,8 +27,8 @@ description: >
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.yorc.experimental.consul.linux.ansible:2.1.0-SNAPSHOT
-  - org.ystia.yorc.experimental.consul.pub:2.1.0-SNAPSHOT
+  - org.ystia.yorc.experimental.consul.linux.ansible:2.1.0-M5
+  - org.ystia.yorc.experimental.consul.pub:2.1.0-M5
 
 topology_template:
   node_templates:
diff --git a/org/ystia/experimental/consul/topologies/SimpleClientServer/types.yaml b/org/ystia/experimental/consul/topologies/SimpleClientServer/types.yaml
index 8dab8ad1..d700f434 100644
--- a/org/ystia/experimental/consul/topologies/SimpleClientServer/types.yaml
+++ b/org/ystia/experimental/consul/topologies/SimpleClientServer/types.yaml
@@ -25,8 +25,8 @@ description: "A simple topology used to demonstrate how to deploy a Consul clust
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.yorc.experimental.consul.linux.ansible:2.1.0-SNAPSHOT
-  - org.ystia.yorc.experimental.consul.pub:2.1.0-SNAPSHOT
+  - org.ystia.yorc.experimental.consul.linux.ansible:2.1.0-M5
+  - org.ystia.yorc.experimental.consul.pub:2.1.0-M5
 
 topology_template:
   node_templates:
diff --git a/org/ystia/flink/linux/bash/types.yml b/org/ystia/flink/linux/bash/types.yml
index f8532bef..a8484ca3 100644
--- a/org/ystia/flink/linux/bash/types.yml
+++ b/org/ystia/flink/linux/bash/types.yml
@@ -8,17 +8,17 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.flink.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Apache Flink is an open source platform for distributed stream and batch data processing.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.flink.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.flink.pub:2.1.0-M5
 
 node_types:
   org.ystia.flink.linux.bash.nodes.JobManager:
diff --git a/org/ystia/flink/pub/types.yml b/org/ystia/flink/pub/types.yml
index e78c3b59..e8ac1942 100644
--- a/org/ystia/flink/pub/types.yml
+++ b/org/ystia/flink/pub/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.flink.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for Flink support.
diff --git a/org/ystia/haproxy/linux/bash/types.yml b/org/ystia/haproxy/linux/bash/types.yml
index 527f5272..5f5cabbe 100644
--- a/org/ystia/haproxy/linux/bash/types.yml
+++ b/org/ystia/haproxy/linux/bash/types.yml
@@ -8,15 +8,15 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.haproxy.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: The HAProxy component
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.haproxy.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.haproxy.pub:2.1.0-M5
 
 node_types:
   org.ystia.haproxy.linux.bash.nodes.HAProxy:
diff --git a/org/ystia/haproxy/pub/types.yml b/org/ystia/haproxy/pub/types.yml
index 4fcef7b4..cb58a4be 100644
--- a/org/ystia/haproxy/pub/types.yml
+++ b/org/ystia/haproxy/pub/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.haproxy.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for HA Proxy support.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
 
 capability_types:
   org.ystia.haproxy.pub.capabilities.Container.HAProxy:
diff --git a/org/ystia/java/linux/bash/types.yml b/org/ystia/java/linux/bash/types.yml
index 189ea7ad..1744bed8 100644
--- a/org/ystia/java/linux/bash/types.yml
+++ b/org/ystia/java/linux/bash/types.yml
@@ -8,15 +8,15 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.java.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Allow to select a Java version to install on a system and to host other components requiring Java on top of it
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
 
 node_types:
   org.ystia.java.linux.bash.nodes.Java:
diff --git a/org/ystia/java/pub/types.yml b/org/ystia/java/pub/types.yml
index 84d1b7bb..651ad26b 100644
--- a/org/ystia/java/pub/types.yml
+++ b/org/ystia/java/pub/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.java.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for Java support.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
 
 # interfaces/Configure/pre_configure_source implementation must be in this public tosca to be able to get the JAVA_HOME value in the relationship target.
 relationship_types:
diff --git a/org/ystia/jupyter/linux/bash/types.yml b/org/ystia/jupyter/linux/bash/types.yml
index b0a58749..d17c69ef 100644
--- a/org/ystia/jupyter/linux/bash/types.yml
+++ b/org/ystia/jupyter/linux/bash/types.yml
@@ -8,16 +8,16 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.jupyter.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Jupyter notebook for linux system
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.python.pub:2.1.0-SNAPSHOT
-  - org.ystia.python.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.python.pub:2.1.0-M5
+  - org.ystia.python.linux.bash:2.1.0-M5
 
 
 node_types:
diff --git a/org/ystia/kafka/linux/bash/types.yml b/org/ystia/kafka/linux/bash/types.yml
index 9064baf3..7feaff0c 100644
--- a/org/ystia/kafka/linux/bash/types.yml
+++ b/org/ystia/kafka/linux/bash/types.yml
@@ -8,17 +8,17 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.kafka.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Kafka is a distributed, partitioned, replicated commit log service.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.kafka.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.kafka.pub:2.1.0-M5
 
 node_types:
   org.ystia.kafka.linux.bash.nodes.Kafka:
diff --git a/org/ystia/kafka/pub/types.yml b/org/ystia/kafka/pub/types.yml
index c50429a1..fcac7030 100644
--- a/org/ystia/kafka/pub/types.yml
+++ b/org/ystia/kafka/pub/types.yml
@@ -8,16 +8,16 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.kafka.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for Kafka support.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
 
 capability_types:
   org.ystia.kafka.pub.capabilities.KafkaHosting:
diff --git a/org/ystia/kibana/linux/bash/types.yml b/org/ystia/kibana/linux/bash/types.yml
index 2bed8017..e711fbf4 100644
--- a/org/ystia/kibana/linux/bash/types.yml
+++ b/org/ystia/kibana/linux/bash/types.yml
@@ -8,18 +8,18 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.kibana.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description:
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
 
 node_types:
   org.ystia.kibana.linux.bash.nodes.Kibana:
diff --git a/org/ystia/kibana/pub/types.yml b/org/ystia/kibana/pub/types.yml
index 58a80304..f406545b 100644
--- a/org/ystia/kibana/pub/types.yml
+++ b/org/ystia/kibana/pub/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.kibana.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for Kibana support.
diff --git a/org/ystia/kubernetes/linux/ansible/types.yml b/org/ystia/kubernetes/linux/ansible/types.yml
index 7309e614..c280cee5 100644
--- a/org/ystia/kubernetes/linux/ansible/types.yml
+++ b/org/ystia/kubernetes/linux/ansible/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.kubernetes.linux.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: |
@@ -17,7 +17,7 @@ description: |
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.kubernetes.pub:2.1.0-SNAPSHOT
+  - org.ystia.kubernetes.pub:2.1.0-M5
 
 
 node_types:
diff --git a/org/ystia/kubernetes/pub/types.yml b/org/ystia/kubernetes/pub/types.yml
index 3f881ab3..55450764 100644
--- a/org/ystia/kubernetes/pub/types.yml
+++ b/org/ystia/kubernetes/pub/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.kubernetes.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for Kubernetes support.
diff --git a/org/ystia/kubernetes/topologies/kubernetes-yorc-cluster/types.yml b/org/ystia/kubernetes/topologies/kubernetes-yorc-cluster/types.yml
index 374eb665..c0246131 100644
--- a/org/ystia/kubernetes/topologies/kubernetes-yorc-cluster/types.yml
+++ b/org/ystia/kubernetes/topologies/kubernetes-yorc-cluster/types.yml
@@ -2,15 +2,15 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: Kubernetes-Yorc-Cluster
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: admin
 
 description: "Setup a Kubernetes Cluster plus some specific credentials to make it manageable by Yorc"
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.kubernetes.pub:2.1.0-SNAPSHOT
-  - org.ystia.kubernetes.linux.ansible:2.1.0-SNAPSHOT
+  - org.ystia.kubernetes.pub:2.1.0-M5
+  - org.ystia.kubernetes.linux.ansible:2.1.0-M5
   - yorc-types:1.0.0
 
 topology_template:
diff --git a/org/ystia/logstash/linux/bash/types.yml b/org/ystia/logstash/linux/bash/types.yml
index 54d0fc31..88af7046 100644
--- a/org/ystia/logstash/linux/bash/types.yml
+++ b/org/ystia/logstash/linux/bash/types.yml
@@ -8,19 +8,19 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.logstash.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description:
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.kafka.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.logstash.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.kafka.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.logstash.pub:2.1.0-M5
 
 node_types:
   org.ystia.logstash.linux.bash.nodes.Logstash:
diff --git a/org/ystia/logstash/pub/types.yml b/org/ystia/logstash/pub/types.yml
index 624464b3..254b331e 100644
--- a/org/ystia/logstash/pub/types.yml
+++ b/org/ystia/logstash/pub/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.logstash.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for Logstash support.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
 
 capability_types:
   org.ystia.logstash.pub.capabilities.LogstashEndpoint:
diff --git a/org/ystia/mongodb/linux/ansible/types.yaml b/org/ystia/mongodb/linux/ansible/types.yaml
index 49e05b49..590e688f 100644
--- a/org/ystia/mongodb/linux/ansible/types.yaml
+++ b/org/ystia/mongodb/linux/ansible/types.yaml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.mongodb.linux.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: MongoBD Component
@@ -16,8 +16,8 @@ description: MongoBD Component
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.mongodb.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.mongodb.pub:2.1.0-M5
 
 node_types:
   org.ystia.mongodb.linux.ansible.nodes.MongoDB:
diff --git a/org/ystia/mongodb/pub/types.yml b/org/ystia/mongodb/pub/types.yml
index a09967ac..cdec98e5 100755
--- a/org/ystia/mongodb/pub/types.yml
+++ b/org/ystia/mongodb/pub/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.mongodb.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for MongoDB support.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
 
 capability_types:
   org.ystia.mongodb.pub.capabilities.Container.MongoDB:
diff --git a/org/ystia/munge/ansible/types.yml b/org/ystia/munge/ansible/types.yml
index 691f5c99..10e36c91 100644
--- a/org/ystia/munge/ansible/types.yml
+++ b/org/ystia/munge/ansible/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.munge.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
diff --git a/org/ystia/mysql/linux/bash/types.yml b/org/ystia/mysql/linux/bash/types.yml
index 9a99480e..e31b85e5 100644
--- a/org/ystia/mysql/linux/bash/types.yml
+++ b/org/ystia/mysql/linux/bash/types.yml
@@ -8,15 +8,15 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.mysql.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: MySQL Component
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.mysql.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.mysql.pub:2.1.0-M5
 
 node_types:
   org.ystia.mysql.linux.bash.nodes.MySQLServer:
diff --git a/org/ystia/mysql/pub/types.yml b/org/ystia/mysql/pub/types.yml
index 3243b7c3..dc10aaad 100644
--- a/org/ystia/mysql/pub/types.yml
+++ b/org/ystia/mysql/pub/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.mysql.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for MySql support.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
 
 capability_types:
   org.ystia.mysql.pub.capabilities.Container.MySQLServer:
diff --git a/org/ystia/nfs/linux/ansible/types.yaml b/org/ystia/nfs/linux/ansible/types.yaml
index 4742094d..a2f38404 100644
--- a/org/ystia/nfs/linux/ansible/types.yaml
+++ b/org/ystia/nfs/linux/ansible/types.yaml
@@ -17,13 +17,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.nfs.linux.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: yorc
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.nfs.pub:2.1.0-SNAPSHOT
+  - org.ystia.nfs.pub:2.1.0-M5
 
 node_types:
   org.ystia.nfs.linux.ansible.nodes.NFSServer:
diff --git a/org/ystia/nfs/pub/types.yaml b/org/ystia/nfs/pub/types.yaml
index f2b30fdf..d555befb 100644
--- a/org/ystia/nfs/pub/types.yaml
+++ b/org/ystia/nfs/pub/types.yaml
@@ -17,7 +17,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.nfs.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: yorc
 
 imports:
diff --git a/org/ystia/nifi/linux/bash/types.yml b/org/ystia/nifi/linux/bash/types.yml
index 275ddfda..60bde75d 100644
--- a/org/ystia/nifi/linux/bash/types.yml
+++ b/org/ystia/nifi/linux/bash/types.yml
@@ -8,16 +8,16 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.nifi.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: NiFi component implementation on Linux
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
 
 node_types:
   org.ystia.nifi.linux.bash.nodes.NiFi:
diff --git a/org/ystia/ntp/ansible/types.yaml b/org/ystia/ntp/ansible/types.yaml
index e3e61633..e2621f47 100644
--- a/org/ystia/ntp/ansible/types.yaml
+++ b/org/ystia/ntp/ansible/types.yaml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.ntp.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: ansible implementation for NTP support.
@@ -17,7 +17,7 @@ description: ansible implementation for NTP support.
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.ntp.pub:2.1.0-SNAPSHOT
+  - org.ystia.ntp.pub:2.1.0-M5
 
 node_types:
   org.ystia.ntp.ansible.nodes.NtpServer:
diff --git a/org/ystia/ntp/pub/types.yaml b/org/ystia/ntp/pub/types.yaml
index c6532d20..7d348715 100644
--- a/org/ystia/ntp/pub/types.yaml
+++ b/org/ystia/ntp/pub/types.yaml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.ntp.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: pub implementation for NTP support.
diff --git a/org/ystia/python/linux/bash/types.yml b/org/ystia/python/linux/bash/types.yml
index d6236b07..9cd8baca 100644
--- a/org/ystia/python/linux/bash/types.yml
+++ b/org/ystia/python/linux/bash/types.yml
@@ -8,15 +8,15 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.python.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Anaconda-Python for linux system
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.python.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.python.pub:2.1.0-M5
 
 
 node_types:
diff --git a/org/ystia/python/pub/types.yml b/org/ystia/python/pub/types.yml
index ef8c99da..bfb5030e 100644
--- a/org/ystia/python/pub/types.yml
+++ b/org/ystia/python/pub/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.python.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for Python-Anaconda support.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
 
 
 relationship_types:
diff --git a/org/ystia/rstudio/linux/bash/types.yml b/org/ystia/rstudio/linux/bash/types.yml
index 7bfa86b7..d3948501 100644
--- a/org/ystia/rstudio/linux/bash/types.yml
+++ b/org/ystia/rstudio/linux/bash/types.yml
@@ -8,15 +8,15 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.rstudio.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: RStudio is a development platform for R through a web dashboard
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
 
 node_types:
   org.ystia.rstudio.linux.bash.nodes.RStudio:
diff --git a/org/ystia/samples/apache-log-generator/types.yml b/org/ystia/samples/apache-log-generator/types.yml
index 4bf63f63..311f4eaf 100644
--- a/org/ystia/samples/apache-log-generator/types.yml
+++ b/org/ystia/samples/apache-log-generator/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.samples.apache-log-generator.linux.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Ystia Fake apache log generator (from Github https://github.com/kiritbasu/Fake-Apache-Log-Generator)
@@ -16,8 +16,8 @@ description: Ystia Fake apache log generator (from Github https://github.com/kir
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
   
 node_types:
   org.ystia.samples.apache-log-generator.linux.ansible.nodes.ApacheLogGeneratorDashboard:
diff --git a/org/ystia/samples/dummylogs/linux/bash/types.yml b/org/ystia/samples/dummylogs/linux/bash/types.yml
index dcfdd594..e8d648fd 100644
--- a/org/ystia/samples/dummylogs/linux/bash/types.yml
+++ b/org/ystia/samples/dummylogs/linux/bash/types.yml
@@ -8,16 +8,16 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.samples.dummylogs.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Ystia DummyLogs Generator Sample
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
   
 node_types:
   org.ystia.samples.dummylogs.linux.bash.nodes.DummyLogsDashboard:
diff --git a/org/ystia/samples/topologies/elk_apache_log_generator/types.yml b/org/ystia/samples/topologies/elk_apache_log_generator/types.yml
index 29a61435..be51e594 100644
--- a/org/ystia/samples/topologies/elk_apache_log_generator/types.yml
+++ b/org/ystia/samples/topologies/elk_apache_log_generator/types.yml
@@ -8,25 +8,25 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.samples.topologies.elk_apache_generator
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.logstash.pub:2.1.0-SNAPSHOT
-  - org.ystia.logstash.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.beats.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.samples.apache-log-generator.linux.ansible:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
+  - org.ystia.logstash.pub:2.1.0-M5
+  - org.ystia.logstash.linux.bash:2.1.0-M5
+  - org.ystia.beats.linux.bash:2.1.0-M5
+  - org.ystia.samples.apache-log-generator.linux.ansible:2.1.0-M5
 
 topology_template:
   description: A topology template to connect the Apache log generator sample to the ELK stack
diff --git a/org/ystia/samples/topologies/elk_beats/types.yml b/org/ystia/samples/topologies/elk_beats/types.yml
index 77c7f171..f81be62f 100644
--- a/org/ystia/samples/topologies/elk_beats/types.yml
+++ b/org/ystia/samples/topologies/elk_beats/types.yml
@@ -8,25 +8,25 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.samples.topologies.elk_beats
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.logstash.pub:2.1.0-SNAPSHOT
-  - org.ystia.logstash.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.beats.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.samples.dummylogs.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
+  - org.ystia.logstash.pub:2.1.0-M5
+  - org.ystia.logstash.linux.bash:2.1.0-M5
+  - org.ystia.beats.linux.bash:2.1.0-M5
+  - org.ystia.samples.dummylogs.linux.bash:2.1.0-M5
 
 topology_template:
   description: A topology template for Beats components with the Ystia DummyLogs sample connected to the ELK stack
diff --git a/org/ystia/samples/topologies/elk_dummylogs/types.yml b/org/ystia/samples/topologies/elk_dummylogs/types.yml
index e825572e..685be96c 100644
--- a/org/ystia/samples/topologies/elk_dummylogs/types.yml
+++ b/org/ystia/samples/topologies/elk_dummylogs/types.yml
@@ -8,25 +8,25 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.samples.topologies.elk_dummylogs
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.logstash.pub:2.1.0-SNAPSHOT
-  - org.ystia.logstash.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.beats.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.samples.dummylogs.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
+  - org.ystia.logstash.pub:2.1.0-M5
+  - org.ystia.logstash.linux.bash:2.1.0-M5
+  - org.ystia.beats.linux.bash:2.1.0-M5
+  - org.ystia.samples.dummylogs.linux.bash:2.1.0-M5
 
 topology_template:
   description: A topology template to connect the Ystia DummyLogs sample to the ELK stack
diff --git a/org/ystia/samples/topologies/elk_heartbeat/types.yml b/org/ystia/samples/topologies/elk_heartbeat/types.yml
index b7ce494f..8fa9b68f 100644
--- a/org/ystia/samples/topologies/elk_heartbeat/types.yml
+++ b/org/ystia/samples/topologies/elk_heartbeat/types.yml
@@ -8,22 +8,22 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.samples.topologies.elk_heartbeat
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.beats.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
+  - org.ystia.beats.linux.bash:2.1.0-M5
 
 topology_template:
   description: A topology template for HeartBeat component with Elasticsearch and Kibana
diff --git a/org/ystia/samples/topologies/elk_nifi/types.yml b/org/ystia/samples/topologies/elk_nifi/types.yml
index ecf0abce..8e7d854d 100644
--- a/org/ystia/samples/topologies/elk_nifi/types.yml
+++ b/org/ystia/samples/topologies/elk_nifi/types.yml
@@ -8,22 +8,22 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.samples.topologies.elk_nifi
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.nifi.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
+  - org.ystia.nifi.linux.bash:2.1.0-M5
 
 topology_template:
   description: A topology template to connect NiFi with Elasticsearch and Kibana
diff --git a/org/ystia/samples/topologies/elk_twitter/types.yml b/org/ystia/samples/topologies/elk_twitter/types.yml
index 3a6220bf..7247d2a2 100644
--- a/org/ystia/samples/topologies/elk_twitter/types.yml
+++ b/org/ystia/samples/topologies/elk_twitter/types.yml
@@ -8,23 +8,23 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.samples.topologies.elk_twitter
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.logstash.pub:2.1.0-SNAPSHOT
-  - org.ystia.logstash.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
+  - org.ystia.logstash.pub:2.1.0-M5
+  - org.ystia.logstash.linux.bash:2.1.0-M5
 
 
 topology_template:
diff --git a/org/ystia/samples/topologies/welcome_basic/types.yml b/org/ystia/samples/topologies/welcome_basic/types.yml
index 559afe5d..4460129b 100644
--- a/org/ystia/samples/topologies/welcome_basic/types.yml
+++ b/org/ystia/samples/topologies/welcome_basic/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.samples.topologies.welcome_basic
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.samples.welcome.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.samples.welcome.linux.bash:2.1.0-M5
 
 topology_template:
   description: A basic topology template for the Welcome sample
diff --git a/org/ystia/samples/welcome/linux/bash/types.yml b/org/ystia/samples/welcome/linux/bash/types.yml
index 71e21146..934a106c 100644
--- a/org/ystia/samples/welcome/linux/bash/types.yml
+++ b/org/ystia/samples/welcome/linux/bash/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.samples.welcome.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Ystia Welcome Web server sample
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
 
 node_types:
   org.ystia.samples.welcome.linux.bash.nodes.Welcome:
diff --git a/org/ystia/slurm/ansible/types.yml b/org/ystia/slurm/ansible/types.yml
index 0e4a2847..2b31b808 100644
--- a/org/ystia/slurm/ansible/types.yml
+++ b/org/ystia/slurm/ansible/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.slurm.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: public implementation for Slurm support.
@@ -17,7 +17,7 @@ description: public implementation for Slurm support.
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.slurm.pub:2.1.0-SNAPSHOT
+  - org.ystia.slurm.pub:2.1.0-M5
 
 node_types:    
   org.ystia.slurm.ansible.nodes.SlurmController:
diff --git a/org/ystia/slurm/pub/types.yml b/org/ystia/slurm/pub/types.yml
index d26e9d9d..aba46411 100644
--- a/org/ystia/slurm/pub/types.yml
+++ b/org/ystia/slurm/pub/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.slurm.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public implementation for Slurm support.
diff --git a/org/ystia/terraform/linux/ansible/types.yaml b/org/ystia/terraform/linux/ansible/types.yaml
index b909aab8..e3e0baf1 100644
--- a/org/ystia/terraform/linux/ansible/types.yaml
+++ b/org/ystia/terraform/linux/ansible/types.yaml
@@ -17,13 +17,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.terraform.linux.terraform
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: yorc
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.terraform.pub:2.1.0-SNAPSHOT
+  - org.ystia.terraform.pub:2.1.0-M5
 
 node_types:
   org.ystia.terraform.linux.terraform.nodes.TerraformRuntime:
diff --git a/org/ystia/terraform/pub/types.yaml b/org/ystia/terraform/pub/types.yaml
index 4de31820..b3246167 100644
--- a/org/ystia/terraform/pub/types.yaml
+++ b/org/ystia/terraform/pub/types.yaml
@@ -17,7 +17,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.terraform.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: yorc
 
 imports:
diff --git a/org/ystia/tests/topologies/elk_elastic/types.yml b/org/ystia/tests/topologies/elk_elastic/types.yml
index 7e5f30ba..32740904 100644
--- a/org/ystia/tests/topologies/elk_elastic/types.yml
+++ b/org/ystia/tests/topologies/elk_elastic/types.yml
@@ -12,19 +12,19 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.tests.topologies.elk_elastic
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
 
 topology_template:
   description: A basic topology template with Elasticsearch
diff --git a/org/ystia/tests/topologies/elk_kafka/types.yml b/org/ystia/tests/topologies/elk_kafka/types.yml
index d98e99f2..7f54007a 100644
--- a/org/ystia/tests/topologies/elk_kafka/types.yml
+++ b/org/ystia/tests/topologies/elk_kafka/types.yml
@@ -12,18 +12,18 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.tests.topologies.elk_kafka
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kafka.pub:2.1.0-SNAPSHOT
-  - org.ystia.kafka.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.kafka.pub:2.1.0-M5
+  - org.ystia.kafka.linux.bash:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
 
 topology_template:
   description: A basic topology template with Kafka
diff --git a/org/ystia/tests/topologies/elk_kibana/types.yml b/org/ystia/tests/topologies/elk_kibana/types.yml
index 1b389d1d..11f6b638 100644
--- a/org/ystia/tests/topologies/elk_kibana/types.yml
+++ b/org/ystia/tests/topologies/elk_kibana/types.yml
@@ -12,21 +12,21 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.tests.topologies.elk_kibana
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
 
 
 topology_template:
diff --git a/org/ystia/tests/topologies/nifi/types.yml b/org/ystia/tests/topologies/nifi/types.yml
index b3168feb..596ee47e 100644
--- a/org/ystia/tests/topologies/nifi/types.yml
+++ b/org/ystia/tests/topologies/nifi/types.yml
@@ -12,18 +12,18 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.tests.topologies.nifi
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.nifi.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.nifi.linux.bash:2.1.0-M5
 
 topology_template:
   description: A basic topology template with NiFi
diff --git a/org/ystia/topologies/a4c_yorc_basic/types.yml b/org/ystia/topologies/a4c_yorc_basic/types.yml
index f932a7d7..f26a95c7 100644
--- a/org/ystia/topologies/a4c_yorc_basic/types.yml
+++ b/org/ystia/topologies/a4c_yorc_basic/types.yml
@@ -2,7 +2,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.a4c_yorc_basic
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: ""
diff --git a/org/ystia/topologies/a4c_yorc_ha/types.yml b/org/ystia/topologies/a4c_yorc_ha/types.yml
index acaae3fa..38a8a265 100644
--- a/org/ystia/topologies/a4c_yorc_ha/types.yml
+++ b/org/ystia/topologies/a4c_yorc_ha/types.yml
@@ -2,7 +2,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.a4c_yorc_ha
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: ""
@@ -20,17 +20,17 @@ imports:
 #  - org.alien4cloud.elasticsearch.pub:2.0.0-SNAPSHOT
 #  - org.alien4cloud.java.jmx.jolokia:2.0.0-SNAPSHOT
 
-  - org.ystia.terraform.linux.terraform:2.1.0-SNAPSHOT
-  - org.ystia.yorc.alien4cloud:2.1.0-SNAPSHOT
-  - org.ystia.ansible.linux.ansible:2.1.0-SNAPSHOT
-  - org.ystia.terraform.pub:2.1.0-SNAPSHOT
-  - org.ystia.yorc.linux.ansible:2.1.0-SNAPSHOT
-  - org.ystia.yorc.experimental.consul.linux.ansible:2.1.0-SNAPSHOT
-  - org.ystia.ansible.pub:2.1.0-SNAPSHOT
-  - org.ystia.yorc.pub:2.1.0-SNAPSHOT
-  - org.ystia.nfs.pub:2.1.0-SNAPSHOT
-  - org.ystia.nfs.linux.ansible:2.1.0-SNAPSHOT
-  - org.ystia.yorc.experimental.consul.pub:2.1.0-SNAPSHOT
+  - org.ystia.terraform.linux.terraform:2.1.0-M5
+  - org.ystia.yorc.alien4cloud:2.1.0-M5
+  - org.ystia.ansible.linux.ansible:2.1.0-M5
+  - org.ystia.terraform.pub:2.1.0-M5
+  - org.ystia.yorc.linux.ansible:2.1.0-M5
+  - org.ystia.yorc.experimental.consul.linux.ansible:2.1.0-M5
+  - org.ystia.ansible.pub:2.1.0-M5
+  - org.ystia.yorc.pub:2.1.0-M5
+  - org.ystia.nfs.pub:2.1.0-M5
+  - org.ystia.nfs.linux.ansible:2.1.0-M5
+  - org.ystia.yorc.experimental.consul.pub:2.1.0-M5
 
 repositories:
   Pulp:
diff --git a/org/ystia/topologies/cloudera-basic/types.yml b/org/ystia/topologies/cloudera-basic/types.yml
index 0f501d9f..0e460f21 100644
--- a/org/ystia/topologies/cloudera-basic/types.yml
+++ b/org/ystia/topologies/cloudera-basic/types.yml
@@ -8,16 +8,16 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.cloudera-basic
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.cloudera.pub:2.1.0-SNAPSHOT
-  - org.ystia.cloudera.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.cloudera.pub:2.1.0-M5
+  - org.ystia.cloudera.linux.bash:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
 
 topology_template:
   description: A topology template for Cloudera.
diff --git a/org/ystia/topologies/elk_basic/types.yml b/org/ystia/topologies/elk_basic/types.yml
index 32c89504..424f28e7 100644
--- a/org/ystia/topologies/elk_basic/types.yml
+++ b/org/ystia/topologies/elk_basic/types.yml
@@ -8,23 +8,23 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.elk_basic
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.logstash.pub:2.1.0-SNAPSHOT
-  - org.ystia.logstash.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
+  - org.ystia.logstash.pub:2.1.0-M5
+  - org.ystia.logstash.linux.bash:2.1.0-M5
 
 topology_template:
   description: A topology template to connect Logstash, Elasticsearch and Kibana
diff --git a/org/ystia/topologies/elk_broker/types.yml b/org/ystia/topologies/elk_broker/types.yml
index c10eb23c..98b4a1df 100644
--- a/org/ystia/topologies/elk_broker/types.yml
+++ b/org/ystia/topologies/elk_broker/types.yml
@@ -8,24 +8,24 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.elk_broker
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.logstash.pub:2.1.0-SNAPSHOT
-  - org.ystia.logstash.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kafka.pub:2.1.0-SNAPSHOT
-  - org.ystia.kafka.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
+  - org.ystia.logstash.pub:2.1.0-M5
+  - org.ystia.logstash.linux.bash:2.1.0-M5
+  - org.ystia.kafka.pub:2.1.0-M5
+  - org.ystia.kafka.linux.bash:2.1.0-M5
 
 topology_template:
   description: A topology template to connect Kafka, Logstash, Elasticsearch and Kibana (Kafka as a broker)
diff --git a/org/ystia/topologies/elk_geonames/types.yml b/org/ystia/topologies/elk_geonames/types.yml
index abd71882..b092abe3 100644
--- a/org/ystia/topologies/elk_geonames/types.yml
+++ b/org/ystia/topologies/elk_geonames/types.yml
@@ -8,21 +8,21 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.elk_geonames
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.logstash.pub:2.1.0-SNAPSHOT
-  - org.ystia.logstash.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
+  - org.ystia.logstash.pub:2.1.0-M5
+  - org.ystia.logstash.linux.bash:2.1.0-M5
 
 topology_template:
   description: A basic topology template for Logstash/Elasticsearch with GeoNames input
diff --git a/org/ystia/topologies/elk_ha/types.yml b/org/ystia/topologies/elk_ha/types.yml
index 3b254534..807184e4 100644
--- a/org/ystia/topologies/elk_ha/types.yml
+++ b/org/ystia/topologies/elk_ha/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.elk_ha
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
@@ -16,19 +16,19 @@ imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - alien-extended-storage-types:2.1.0-SM6
 
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.pub:2.1.0-SNAPSHOT
-  - org.ystia.elasticsearch.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kibana.pub:2.1.0-SNAPSHOT
-  - org.ystia.kibana.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.logstash.pub:2.1.0-SNAPSHOT
-  - org.ystia.logstash.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.kafka.pub:2.1.0-SNAPSHOT
-  - org.ystia.kafka.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.elasticsearch.pub:2.1.0-M5
+  - org.ystia.elasticsearch.linux.bash:2.1.0-M5
+  - org.ystia.kibana.pub:2.1.0-M5
+  - org.ystia.kibana.linux.bash:2.1.0-M5
+  - org.ystia.logstash.pub:2.1.0-M5
+  - org.ystia.logstash.linux.bash:2.1.0-M5
+  - org.ystia.kafka.pub:2.1.0-M5
+  - org.ystia.kafka.linux.bash:2.1.0-M5
 
 topology_template:
   description: A topology template to connect Kafka, Logstash, Elasticsearch and Kibana (Kafka as a broker), in High Avaibilty mode
diff --git a/org/ystia/topologies/flink/types.yml b/org/ystia/topologies/flink/types.yml
index b0a19f94..b6c3b328 100644
--- a/org/ystia/topologies/flink/types.yml
+++ b/org/ystia/topologies/flink/types.yml
@@ -8,19 +8,19 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.flink
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.flink.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.consul.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.flink.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.consul.pub:2.1.0-M5
+  - org.ystia.flink.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.consul.linux.bash:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.flink.linux.bash:2.1.0-M5
 
 topology_template:
   description: A basic topology template with Flink
diff --git a/org/ystia/topologies/haproxy/types.yml b/org/ystia/topologies/haproxy/types.yml
index b9818d75..971ba201 100644
--- a/org/ystia/topologies/haproxy/types.yml
+++ b/org/ystia/topologies/haproxy/types.yml
@@ -8,15 +8,15 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.haproxy
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.haproxy.pub:2.1.0-SNAPSHOT
-  - org.ystia.haproxy.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.haproxy.pub:2.1.0-M5
+  - org.ystia.haproxy.linux.bash:2.1.0-M5
 
 topology_template:
   description: A basic topology template with HAProxyHTTP and HAProxyTCP
diff --git a/org/ystia/topologies/jupyter/types.yml b/org/ystia/topologies/jupyter/types.yml
index 2269456f..8217900e 100644
--- a/org/ystia/topologies/jupyter/types.yml
+++ b/org/ystia/topologies/jupyter/types.yml
@@ -8,16 +8,16 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.jupyter
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - alien-extended-storage-types:2.1.0-SM6
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.python.pub:2.1.0-SNAPSHOT
-  - org.ystia.python.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.jupyter.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.python.pub:2.1.0-M5
+  - org.ystia.python.linux.bash:2.1.0-M5
+  - org.ystia.jupyter.linux.bash:2.1.0-M5
 
 
 topology_template:
diff --git a/org/ystia/topologies/mysql_single/types.yml b/org/ystia/topologies/mysql_single/types.yml
index 62fac4c6..9050ffeb 100644
--- a/org/ystia/topologies/mysql_single/types.yml
+++ b/org/ystia/topologies/mysql_single/types.yml
@@ -8,13 +8,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.mysql_single
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.mysql.pub:2.1.0-SNAPSHOT
-  - org.ystia.mysql.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.mysql.pub:2.1.0-M5
+  - org.ystia.mysql.linux.bash:2.1.0-M5
 
 topology_template:
   description: A basic topology template for MySQL as a Single Server node
diff --git a/org/ystia/topologies/rstudio/types.yml b/org/ystia/topologies/rstudio/types.yml
index 5b8dcd01..f22ecddf 100644
--- a/org/ystia/topologies/rstudio/types.yml
+++ b/org/ystia/topologies/rstudio/types.yml
@@ -8,16 +8,16 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.topologies.rstudio
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - alien-extended-storage-types:2.1.0-SM6
-  - org.ystia.common:2.1.0-SNAPSHOT
-  - org.ystia.java.pub:2.1.0-SNAPSHOT
-  - org.ystia.java.linux.bash:2.1.0-SNAPSHOT
-  - org.ystia.rstudio.linux.bash:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
+  - org.ystia.java.pub:2.1.0-M5
+  - org.ystia.java.linux.bash:2.1.0-M5
+  - org.ystia.rstudio.linux.bash:2.1.0-M5
 
 topology_template:
   description: A basic topology template with RStudio
diff --git a/org/ystia/topologies/slurm/types.yml b/org/ystia/topologies/slurm/types.yml
index ff9e9e27..603b5959 100644
--- a/org/ystia/topologies/slurm/types.yml
+++ b/org/ystia/topologies/slurm/types.yml
@@ -8,15 +8,15 @@ metadata:
 description: "Configure a Slurm cluster"
 
 imports:
-  - org.ystia.ntp.ansible:2.1.0-SNAPSHOT
-  - org.ystia.ntp.pub:2.1.0-SNAPSHOT
+  - org.ystia.ntp.ansible:2.1.0-M5
+  - org.ystia.ntp.pub:2.1.0-M5
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.slurm.pub:2.1.0-SNAPSHOT
-  - org.ystia.munge.ansible:2.1.0-SNAPSHOT
-  - org.ystia.slurm.ansible:2.1.0-SNAPSHOT
-  - org.ystia.dns.resolvconf.ansible:2.1.0-SNAPSHOT
-  - org.ystia.dns.pub:2.1.0-SNAPSHOT
-  - org.ystia.dns.dnsmasq.ansible:2.1.0-SNAPSHOT
+  - org.ystia.slurm.pub:2.1.0-M5
+  - org.ystia.munge.ansible:2.1.0-M5
+  - org.ystia.slurm.ansible:2.1.0-M5
+  - org.ystia.dns.resolvconf.ansible:2.1.0-M5
+  - org.ystia.dns.pub:2.1.0-M5
+  - org.ystia.dns.dnsmasq.ansible:2.1.0-M5
   - yorc-types:1.0.0
 
 topology_template:
diff --git a/org/ystia/traefik/ansible-linux/types.yml b/org/ystia/traefik/ansible-linux/types.yml
index 1ba1d340..ca120a87 100644
--- a/org/ystia/traefik/ansible-linux/types.yml
+++ b/org/ystia/traefik/ansible-linux/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.traefik.ansible-linux
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Traefik reverse proxy implementation using Ansible on Linux
@@ -16,7 +16,7 @@ description: Traefik reverse proxy implementation using Ansible on Linux
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.traefik.pub:2.1.0-SNAPSHOT
+  - org.ystia.traefik.pub:2.1.0-M5
 
 node_types:
   org.ystia.traefik.ansible-linux.nodes.Traefik:
diff --git a/org/ystia/traefik/pub/types.yml b/org/ystia/traefik/pub/types.yml
index 84806455..a51a94d5 100644
--- a/org/ystia/traefik/pub/types.yml
+++ b/org/ystia/traefik/pub/types.yml
@@ -8,7 +8,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.traefik.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Public interface types for Traefik reverse proxy support.
diff --git a/org/ystia/xfs/linux/bash/types.yml b/org/ystia/xfs/linux/bash/types.yml
index df073dc4..0d436229 100644
--- a/org/ystia/xfs/linux/bash/types.yml
+++ b/org/ystia/xfs/linux/bash/types.yml
@@ -8,14 +8,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.xfs.linux.bash
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: Ystia
 
 description: Extended Storage Ystia Component
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.common:2.1.0-SNAPSHOT
+  - org.ystia.common:2.1.0-M5
 
 node_types:
   org.ystia.xfs.linux.bash.nodes.XFS:
diff --git a/org/ystia/yorc/alien4cloud/types.yaml b/org/ystia/yorc/alien4cloud/types.yaml
index 07012137..4b02d57d 100644
--- a/org/ystia/yorc/alien4cloud/types.yaml
+++ b/org/ystia/yorc/alien4cloud/types.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.yorc.alien4cloud
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: alien4cloud
 
 imports:
@@ -13,7 +13,7 @@ imports:
   - org.alien4cloud.alien4cloud.config.location_resources.autoconfig:2.1.0-SM6
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.yorc.pub:2.1.0-SNAPSHOT
+  - org.ystia.yorc.pub:2.1.0-M5
 
 node_types:
 
diff --git a/org/ystia/yorc/yorc/linux/ansible/types.yaml b/org/ystia/yorc/yorc/linux/ansible/types.yaml
index 39608c23..2125097f 100644
--- a/org/ystia/yorc/yorc/linux/ansible/types.yaml
+++ b/org/ystia/yorc/yorc/linux/ansible/types.yaml
@@ -18,14 +18,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.yorc.linux.ansible
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: yorc
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
   - yorc-types:1.0.0
-  - org.ystia.yorc.pub:2.1.0-SNAPSHOT
-  - org.ystia.yorc.experimental.consul.pub:2.1.0-SNAPSHOT
+  - org.ystia.yorc.pub:2.1.0-M5
+  - org.ystia.yorc.experimental.consul.pub:2.1.0-M5
 
 
 node_types:
diff --git a/org/ystia/yorc/yorc/pub/types.yaml b/org/ystia/yorc/yorc/pub/types.yaml
index 9766f0ce..ad79390a 100644
--- a/org/ystia/yorc/yorc/pub/types.yaml
+++ b/org/ystia/yorc/yorc/pub/types.yaml
@@ -17,14 +17,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.ystia.yorc.pub
-  template_version: 2.1.0-SNAPSHOT
+  template_version: 2.1.0-M5
   template_author: yorc
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.ystia.yorc.experimental.consul.pub:2.1.0-SNAPSHOT
-  - org.ystia.ansible.pub:2.1.0-SNAPSHOT
-  - org.ystia.terraform.pub:2.1.0-SNAPSHOT
+  - org.ystia.yorc.experimental.consul.pub:2.1.0-M5
+  - org.ystia.ansible.pub:2.1.0-M5
+  - org.ystia.terraform.pub:2.1.0-M5
 
 node_types:
   org.ystia.yorc.pub.infrastructure.GoogleConfig:
diff --git a/versions.yaml b/versions.yaml
index e50d5750..90b7fdce 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -1 +1 @@
-forge_version: 2.1.0-SNAPSHOT
+forge_version: 2.1.0-M5