diff --git a/org.eclipse.lyo.oslc4j.plugins/pom.xml b/org.eclipse.lyo.oslc4j.plugins/pom.xml
index a081d0a0..1a98c443 100644
--- a/org.eclipse.lyo.oslc4j.plugins/pom.xml
+++ b/org.eclipse.lyo.oslc4j.plugins/pom.xml
@@ -23,7 +23,7 @@
 		<maven.compiler.release>17</maven.compiler.release>
         <tycho.version>4.0.6</tycho.version>
         <eclipse.cbi>1.1.7</eclipse.cbi>
-        <lyo.version>5.1.1.Final</lyo.version>
+        <lyo.version>6.0.0.CR</lyo.version>
     </properties>
     <repositories>
         <repository>
diff --git a/org.eclipse.lyo.tools.toolchain.design/description/ToolChainModel.odesign b/org.eclipse.lyo.tools.toolchain.design/description/ToolChainModel.odesign
index 126aa991..e1370001 100644
--- a/org.eclipse.lyo.tools.toolchain.design/description/ToolChainModel.odesign
+++ b/org.eclipse.lyo.tools.toolchain.design/description/ToolChainModel.odesign
@@ -267,7 +267,7 @@
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="filesBasePath" valueExpression="[filesBasePath/]"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="adaptorinterface.MavenProjectConfiguration" referenceName="projectConfiguration" variableName="projectConfiguration">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="lyoVersion" valueExpression="['6.0.0-SNAPSHOT'/]"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="lyoVersion" valueExpression="['6.0.0.CR'/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="groupId" valueExpression="[generalConfiguration.javaBasePackageName/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="artifactId" valueExpression="[adaptorInterface.name.toLower().replaceAll('\\W+', '-')/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="version" valueExpression="['0.0.1-SNAPSHOT'/]"/>
@@ -353,7 +353,7 @@
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="filesBasePath" valueExpression="[filesBasePath/]"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="adaptorinterface.MavenProjectConfiguration" referenceName="projectConfiguration" variableName="projectConfiguration">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="lyoVersion" valueExpression="['6.0.0-SNAPSHOT'/]"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="lyoVersion" valueExpression="['6.0.0.CR'/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="groupId" valueExpression="[generalConfiguration.javaBasePackageName/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="artifactId" valueExpression="[adaptorInterface.name.toLower().replaceAll('\\W+', '-')/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="version" valueExpression="['0.0.1-SNAPSHOT'/]"/>
@@ -1007,7 +1007,7 @@
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="filesBasePath" valueExpression="[filesBasePath/]"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="adaptorinterface.MavenProjectConfiguration" referenceName="projectConfiguration" variableName="projectConfiguration">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="lyoVersion" valueExpression="['6.0.0-SNAPSHOT'/]"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="lyoVersion" valueExpression="['6.0.0.CR'/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="groupId" valueExpression="[generalConfiguration.javaBasePackageName/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="artifactId" valueExpression="[adaptorInterface.name.toLower().replaceAll('\\W+', '-')/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="version" valueExpression="['0.0.1-SNAPSHOT'/]"/>
@@ -1936,7 +1936,7 @@
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="doNotGenerate" valueExpression="[doNotGenerate/]"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="adaptorinterface.MavenProjectConfiguration" referenceName="projectConfiguration" variableName="projectConfiguration">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="lyoVersion" valueExpression="['6.0.0-SNAPSHOT'/]"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="lyoVersion" valueExpression="['6.0.0.CR'/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="artifactId" valueExpression="[if (container.oclIsTypeOf(DomainSpecification)) then container.oclAsType(DomainSpecification).name.toLower().replaceAll('\\W+', '-') else 'oslc-specification' endif/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="groupId" valueExpression="[if (not projectConfiguration.isNullOrEmpty(generalConfiguration.javaBasePackageName)) then generalConfiguration.javaBasePackageName else projectConfiguration.artifactId endif/]"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="version" valueExpression="['0.0.1-SNAPSHOT'/]"/>