diff --git a/org.eclipse.lyo.oslc4j.adaptormodel/META-INF/MANIFEST.MF b/org.eclipse.lyo.oslc4j.adaptormodel/META-INF/MANIFEST.MF
index 9cae97c..9c1fa7d 100644
--- a/org.eclipse.lyo.oslc4j.adaptormodel/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.oslc4j.adaptormodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.oslc4j.adaptormodel;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/.project b/org.eclipse.lyo.oslc4j.codegenerator/.project
index b861aad..f986497 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/.project
+++ b/org.eclipse.lyo.oslc4j.codegenerator/.project
@@ -37,8 +37,14 @@
 				</dictionary>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/.settings/org.eclipse.core.resources.prefs b/org.eclipse.lyo.oslc4j.codegenerator/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.lyo.oslc4j.codegenerator/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.lyo.oslc4j.codegenerator/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.lyo.oslc4j.codegenerator/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/META-INF/MANIFEST.MF b/org.eclipse.lyo.oslc4j.codegenerator/META-INF/MANIFEST.MF
index 3006dca..07f1367 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.oslc4j.codegenerator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Toolchain Code Generator
 Bundle-SymbolicName: org.eclipse.lyo.oslc4j.codegenerator
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-Activator: org.eclipse.lyo.oslc4j.codegenerator.Activator
 Bundle-Vendor: Eclipse Lyo
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/pom.xml b/org.eclipse.lyo.oslc4j.codegenerator/pom.xml
index 607a1f3..1f0e7fb 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/pom.xml
+++ b/org.eclipse.lyo.oslc4j.codegenerator/pom.xml
@@ -20,12 +20,12 @@
 	<parent>
 		<groupId>org.eclipse.lyo.tools</groupId>
 		<artifactId>tools-parent</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.3.0.M3</version>
 		<relativePath>../org.eclipse.lyo.tools.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.lyo.oslc4j.codegenerator</artifactId>
-	<version>2.3.0-SNAPSHOT</version> <!-- This version should match the version of your project in the MANIFEST.MF -->
+	<version>2.3.0.M3</version> <!-- This version should match the version of your project in the MANIFEST.MF -->
 	<packaging>eclipse-plugin</packaging>
 
 	<properties>
@@ -36,17 +36,17 @@
 		<dependency>
 			<groupId>org.eclipse.lyo.tools</groupId>
 			<artifactId>org.eclipse.lyo.oslc4j.adaptormodel</artifactId>
-			<version>2.3.0-SNAPSHOT</version>
+			<version>2.3.0.M3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.lyo.tools</groupId>
 			<artifactId>org.eclipse.lyo.tools.adaptormodel.model</artifactId>
-			<version>2.3.0-SNAPSHOT</version>
+			<version>2.3.0.M3</version>
 		</dependency>
         <dependency>
             <groupId>org.eclipse.lyo.tools</groupId>
             <artifactId>org.eclipse.lyo.tools.vocabulary.model</artifactId>
-            <version>2.3.0-SNAPSHOT</version>
+            <version>2.3.0.M3</version>
         </dependency>
 
 
@@ -93,8 +93,8 @@
 							<!-- <jar>p2.eclipse-plugin:org.eclipse.lyo.tools.adaptormodel.model</jar> -->
 							<!-- <jar>org.eclipse.lyo.tools.adaptormodel.model</jar> -->
                             <!-- <jar>org.eclipse.lyo.tools:org.eclipse.lyo.tools.adaptormodel.model</jar> -->
-							<jar>${project.basedir}/../org.eclipse.lyo.tools.adaptormodel.model/target/org.eclipse.lyo.tools.adaptormodel.model-2.3.0-SNAPSHOT.jar</jar>
-                            <jar>${project.basedir}/../org.eclipse.lyo.tools.vocabulary.model/target/org.eclipse.lyo.tools.vocabulary.model-2.3.0-SNAPSHOT.jar</jar>
+							<jar>${project.basedir}/../org.eclipse.lyo.tools.adaptormodel.model/target/org.eclipse.lyo.tools.adaptormodel.model-2.3.0.M3.jar</jar>
+                            <jar>${project.basedir}/../org.eclipse.lyo.tools.vocabulary.model/target/org.eclipse.lyo.tools.vocabulary.model-2.3.0.M3.jar</jar>
 							<!-- <jar>C:\Users\jad\git\org.eclipse.lyo.tools\org.eclipse.lyo.tools.adaptormodel.model\target\org.eclipse.lyo.tools.adaptormodel.model-2.2.0-SNAPSHOT.jar</jar> -->
 						</jars>
 					</acceleoProject>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl
index b56770a..9696ede 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateGetResourceJsp.mtl
@@ -130,7 +130,7 @@
   <footer class="footer">
     <div class="container">
       <p class="text-muted">
-        OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a> 2.3.0-SNAPSHOT.
+        OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a>.
       </p>
     </div>
   </footer>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl
index 3f3ccf0..0336db9 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCollectionJsp.mtl
@@ -124,7 +124,7 @@
       </div>
   <footer class="footer">
       <div class="container">
-          <p class="text-muted">OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a> 2.3.0-SNAPSHOT.</p>
+          <p class="text-muted">OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a>.</p>
       </div>
   </footer>
 </body>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl
index b1aad7f..d7f14af 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceCreatorClientJsp.mtl
@@ -119,7 +119,7 @@
 <footer class="footer">
   <div class="container">
     <p class="text-muted">
-      OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a> 2.3.0-SNAPSHOT.
+      OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a>.
     </p>
   </div>
 </footer>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl
index e8dc84f..8a9e1f9 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceSelectorClientJsp.mtl
@@ -118,7 +118,7 @@
 <footer class="footer">
   <div class="container">
     <p class="text-muted">
-      OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a> 2.3.0-SNAPSHOT.
+      OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a>.
     </p>
   </div>
 </footer>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl
index 7c2f286..669bffe 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateResourceShapeJsp.mtl
@@ -186,7 +186,7 @@
         <footer class="footer">
             <div class="container">
                 <p class="text-muted">
-                    OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a> 2.3.0-SNAPSHOT.
+                    OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a>.
                 </p>
             </div>
         </footer>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl
index 9c3c622..1422c99 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderCatalogHTML.mtl
@@ -118,7 +118,7 @@
   <footer class="footer">
     <div class="container">
       <p class="text-muted">
-        OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a> 2.3.0-SNAPSHOT.
+        OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a>.
       </p>
     </div>
   </footer>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl
index 48ba0f2..d8479e0 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/jsp/generateServiceProviderHTML.mtl
@@ -193,7 +193,7 @@
   <footer class="footer">
     <div class="container">
       <p class="text-muted">
-        OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a> 2.3.0-SNAPSHOT.
+        OSLC Adaptor was generated using <a href="http://eclipse.org/lyo">Eclipse Lyo</a>.
       </p>
     </div>
   </footer>
diff --git a/org.eclipse.lyo.tools.adaptormodel.edit/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.adaptormodel.edit/META-INF/MANIFEST.MF
index 9701dfa..bfba47c 100644
--- a/org.eclipse.lyo.tools.adaptormodel.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.adaptormodel.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.adaptormodel.edit;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Activator: adaptorinterface.provider.AdaptorInterfaceEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.lyo.tools.adaptormodel.editor/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.adaptormodel.editor/META-INF/MANIFEST.MF
index a4e6034..734e154 100644
--- a/org.eclipse.lyo.tools.adaptormodel.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.adaptormodel.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.adaptormodel.editor;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Activator: adaptorinterface.presentation.AdaptorInterfaceEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.lyo.tools.adaptormodel.model/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.adaptormodel.model/META-INF/MANIFEST.MF
index e4319b7..c24500f 100644
--- a/org.eclipse.lyo.tools.adaptormodel.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.adaptormodel.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.adaptormodel.model;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.lyo.tools.adaptormodel.tests/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.adaptormodel.tests/META-INF/MANIFEST.MF
index 4b791c7..4cc108b 100644
--- a/org.eclipse.lyo.tools.adaptormodel.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.adaptormodel.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.adaptormodel.tests;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.lyo.tools.codegenerator.feature/feature.xml b/org.eclipse.lyo.tools.codegenerator.feature/feature.xml
index 8780274..f1ea8c5 100644
--- a/org.eclipse.lyo.tools.codegenerator.feature/feature.xml
+++ b/org.eclipse.lyo.tools.codegenerator.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.lyo.tools.codegenerator.feature"
       label="Lyo Code Generator"
-      version="2.3.0.qualifier"
+      version="2.3.0.M3"
       provider-name="Eclipse Lyo">
 
    <description url="https://www.eclipse.org/lyo/">
diff --git a/org.eclipse.lyo.tools.codegenerator.ui/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.codegenerator.ui/META-INF/MANIFEST.MF
index de5b5ed..cda65d7 100644
--- a/org.eclipse.lyo.tools.codegenerator.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.codegenerator.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Acceleo Codegenerator Module IDE Plug-in
 Bundle-SymbolicName: org.eclipse.lyo.tools.codegenerator.ui;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-Activator: org.eclipse.lyo.tools.codegenerator.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.lyo.tools.parent/pom.xml b/org.eclipse.lyo.tools.parent/pom.xml
index 56e0137..de74c65 100644
--- a/org.eclipse.lyo.tools.parent/pom.xml
+++ b/org.eclipse.lyo.tools.parent/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.lyo.tools</groupId>
 	<artifactId>tools-parent</artifactId>
-	<version>2.3.0-SNAPSHOT</version>
+	<version>2.3.0.M3</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/org.eclipse.lyo.tools.toolchain.design/.project b/org.eclipse.lyo.tools.toolchain.design/.project
index 09af796..a7b03f7 100644
--- a/org.eclipse.lyo.tools.toolchain.design/.project
+++ b/org.eclipse.lyo.tools.toolchain.design/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/org.eclipse.lyo.tools.toolchain.design/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.toolchain.design/META-INF/MANIFEST.MF
index 51f9277..3edf510 100644
--- a/org.eclipse.lyo.tools.toolchain.design/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.toolchain.design/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: ToolChainModel.design
 Bundle-SymbolicName: org.eclipse.lyo.tools.toolchain.design;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-Activator: ToolChainModel.design.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.lyo.tools.toolchain.design/pom.xml b/org.eclipse.lyo.tools.toolchain.design/pom.xml
index 8e9d2fb..333de0f 100644
--- a/org.eclipse.lyo.tools.toolchain.design/pom.xml
+++ b/org.eclipse.lyo.tools.toolchain.design/pom.xml
@@ -20,12 +20,12 @@
 	<parent>
 		<groupId>org.eclipse.lyo.tools</groupId>
 		<artifactId>tools-parent</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.3.0.M3</version>
 		<relativePath>../org.eclipse.lyo.tools.parent</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.lyo.tools.toolchain.design</artifactId>
-	<version>2.3.0-SNAPSHOT</version> <!-- This version should match the version of your project in the MANIFEST.MF -->
+	<version>2.3.0.M3</version> <!-- This version should match the version of your project in the MANIFEST.MF -->
 	<packaging>eclipse-plugin</packaging>
 
 	<properties>
@@ -36,32 +36,32 @@
 		<dependency>
 			<groupId>org.eclipse.lyo.tools</groupId>
 			<artifactId>org.eclipse.lyo.oslc4j.adaptormodel</artifactId>
-			<version>2.3.0-SNAPSHOT</version>
+			<version>2.3.0.M3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.lyo.tools</groupId>
 			<artifactId>org.eclipse.lyo.tools.adaptormodel.model</artifactId>
-			<version>2.3.0-SNAPSHOT</version>
+			<version>2.3.0.M3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.lyo.tools</groupId>
 			<artifactId>org.eclipse.lyo.tools.toolchain.model</artifactId>
-			<version>2.3.0-SNAPSHOT</version>
+			<version>2.3.0.M3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.lyo.tools</groupId>
 			<artifactId>org.eclipse.lyo.tools.vocabulary.model</artifactId>
-			<version>2.3.0-SNAPSHOT</version>
+			<version>2.3.0.M3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.lyo.tools</groupId>
 			<artifactId>org.eclipse.lyo.tools.toolchain.edit</artifactId>
-			<version>2.3.0-SNAPSHOT</version>
+			<version>2.3.0.M3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.lyo.tools</groupId>
 			<artifactId>org.eclipse.lyo.tools.toolchain.editor</artifactId>
-			<version>2.3.0-SNAPSHOT</version>
+			<version>2.3.0.M3</version>
 		</dependency>
 	</dependencies>
 
@@ -91,9 +91,9 @@
 							</entry>
 						</entries>
 						<jars>
-							<jar>${project.basedir}/../org.eclipse.lyo.tools.adaptormodel.model/target/org.eclipse.lyo.tools.adaptormodel.model-2.3.0-SNAPSHOT.jar</jar>
-							<jar>${project.basedir}/../org.eclipse.lyo.tools.toolchain.model/target/org.eclipse.lyo.tools.toolchain.model-2.3.0-SNAPSHOT.jar</jar>
-							<jar>${project.basedir}/../org.eclipse.lyo.tools.vocabulary.model/target/org.eclipse.lyo.tools.vocabulary.model-2.3.0-SNAPSHOT.jar</jar>
+							<jar>${project.basedir}/../org.eclipse.lyo.tools.adaptormodel.model/target/org.eclipse.lyo.tools.adaptormodel.model-2.3.0.M3.jar</jar>
+							<jar>${project.basedir}/../org.eclipse.lyo.tools.toolchain.model/target/org.eclipse.lyo.tools.toolchain.model-2.3.0.M3.jar</jar>
+							<jar>${project.basedir}/../org.eclipse.lyo.tools.vocabulary.model/target/org.eclipse.lyo.tools.vocabulary.model-2.3.0.M3.jar</jar>
 						</jars>
 					</acceleoProject>
 					<packagesToRegister>
diff --git a/org.eclipse.lyo.tools.toolchain.edit/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.toolchain.edit/META-INF/MANIFEST.MF
index 90c1800..45b0f09 100644
--- a/org.eclipse.lyo.tools.toolchain.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.toolchain.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.toolchain.edit;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Activator: toolchain.provider.ToolchainEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.lyo.tools.toolchain.editor/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.toolchain.editor/META-INF/MANIFEST.MF
index b0501da..a10a92d 100644
--- a/org.eclipse.lyo.tools.toolchain.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.toolchain.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.toolchain.editor;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Activator: toolchain.presentation.ToolchainEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.lyo.tools.toolchain.feature/feature.xml b/org.eclipse.lyo.tools.toolchain.feature/feature.xml
index 602d56b..a911042 100644
--- a/org.eclipse.lyo.tools.toolchain.feature/feature.xml
+++ b/org.eclipse.lyo.tools.toolchain.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.lyo.tools.toolchain.feature"
       label="Lyo Toolchain Designer"
-      version="2.3.0.qualifier"
+      version="2.3.0.M3"
       provider-name="Eclipse Lyo">
 
    <description url="https://www.eclipse.org/lyo/">
diff --git a/org.eclipse.lyo.tools.toolchain.model.tests/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.toolchain.model.tests/META-INF/MANIFEST.MF
index 5154f4a..c88a284 100644
--- a/org.eclipse.lyo.tools.toolchain.model.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.toolchain.model.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.toolchain.model.tests;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.lyo.tools.toolchain.model/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.toolchain.model/META-INF/MANIFEST.MF
index 5ecd0c0..b0ed1fc 100644
--- a/org.eclipse.lyo.tools.toolchain.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.toolchain.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.toolchain.model;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.lyo.tools.updatesite/.project b/org.eclipse.lyo.tools.updatesite/.project
index b264afd..2ca9aab 100644
--- a/org.eclipse.lyo.tools.updatesite/.project
+++ b/org.eclipse.lyo.tools.updatesite/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.UpdateSiteNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.lyo.tools.updatesite/category.xml b/org.eclipse.lyo.tools.updatesite/category.xml
index 17effa6..c996147 100644
--- a/org.eclipse.lyo.tools.updatesite/category.xml
+++ b/org.eclipse.lyo.tools.updatesite/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.lyo.tools.codegenerator.feature_2.3.0.qualifier.jar" id="org.eclipse.lyo.tools.codegenerator.feature" version="2.3.0.qualifier">
+   <feature url="features/org.eclipse.lyo.tools.codegenerator.feature_2.3.0.M3.jar" id="org.eclipse.lyo.tools.codegenerator.feature" version="2.3.0.M3">
       <category name="org.eclipse.lyo.tools.category"/>
    </feature>
-   <feature url="features/org.eclipse.lyo.tools.toolchain.feature_2.3.0.qualifier.jar" id="org.eclipse.lyo.tools.toolchain.feature" version="2.3.0.qualifier">
+   <feature url="features/org.eclipse.lyo.tools.toolchain.feature_2.3.0.M3.jar" id="org.eclipse.lyo.tools.toolchain.feature" version="2.3.0.M3">
       <category name="org.eclipse.lyo.tools.category"/>
    </feature>
    <category-def name="org.eclipse.lyo.tools.category" label="Lyo Toolchain Designer"/>
diff --git a/org.eclipse.lyo.tools.updatesite/pom.xml b/org.eclipse.lyo.tools.updatesite/pom.xml
index 6ca5e50..0e541f1 100644
--- a/org.eclipse.lyo.tools.updatesite/pom.xml
+++ b/org.eclipse.lyo.tools.updatesite/pom.xml
@@ -3,10 +3,10 @@
 	<parent>
 		<groupId>org.eclipse.lyo.tools</groupId>
 		<artifactId>tools-parent</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.3.0.M3</version>
 		<relativePath>../org.eclipse.lyo.tools.parent</relativePath>
 	</parent>
 	<artifactId>tools-updatesite</artifactId>
-	<version>2.3.0-SNAPSHOT</version>
+	<version>2.3.0.M3</version>
 	<packaging>eclipse-repository</packaging>
 </project>
diff --git a/org.eclipse.lyo.tools.vocabulary.editor/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.vocabulary.editor/META-INF/MANIFEST.MF
index bc12fec..9589de3 100644
--- a/org.eclipse.lyo.tools.vocabulary.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.vocabulary.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.vocabulary.editor;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Activator: vocabulary.presentation.VocabularyEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.lyo.tools.vocabulary.model.edit/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.vocabulary.model.edit/META-INF/MANIFEST.MF
index b1d262a..e7e77af 100644
--- a/org.eclipse.lyo.tools.vocabulary.model.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.vocabulary.model.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.vocabulary.model.edit;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Activator: vocabulary.provider.VocabularyEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.lyo.tools.vocabulary.model.tests/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.vocabulary.model.tests/META-INF/MANIFEST.MF
index f57681d..c372c47 100644
--- a/org.eclipse.lyo.tools.vocabulary.model.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.vocabulary.model.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.vocabulary.model.tests;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.lyo.tools.vocabulary.model/META-INF/MANIFEST.MF b/org.eclipse.lyo.tools.vocabulary.model/META-INF/MANIFEST.MF
index fecb4a3..bd2eeae 100644
--- a/org.eclipse.lyo.tools.vocabulary.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.lyo.tools.vocabulary.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.lyo.tools.vocabulary.model;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.M3
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/pom.xml b/pom.xml
index 67a47f1..3662352 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.lyo.tools</groupId>
 	<artifactId>tools-root</artifactId>
-	<version>2.3.0-SNAPSHOT</version>
+	<version>2.3.0.M3</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.eclipse.lyo.tools</groupId>
 		<artifactId>tools-parent</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.3.0.M3</version>
 		<relativePath>./org.eclipse.lyo.tools.parent</relativePath>
 	</parent>