diff --git a/org.eclipse.scout.sdk-feature/feature.xml b/org.eclipse.scout.sdk-feature/feature.xml
index aeee7b7..2591362 100644
--- a/org.eclipse.scout.sdk-feature/feature.xml
+++ b/org.eclipse.scout.sdk-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.scout.sdk-feature"
       label="%featureName"
-      version="6.0.0.qualifier"
+      version="6.0.0.M7"
       provider-name="%providerName"
       plugin="org.eclipse.scout.sdk.s2e"
       license-feature="org.eclipse.license"
diff --git a/org.eclipse.scout.sdk-feature/pom.xml b/org.eclipse.scout.sdk-feature/pom.xml
index 3977531..7ab63ef 100644
--- a/org.eclipse.scout.sdk-feature/pom.xml
+++ b/org.eclipse.scout.sdk-feature/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk.p2</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk.p2/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk-repository/category.xml b/org.eclipse.scout.sdk-repository/category.xml
index 7e14228..ebe8d23 100644
--- a/org.eclipse.scout.sdk-repository/category.xml
+++ b/org.eclipse.scout.sdk-repository/category.xml
@@ -12,10 +12,10 @@
 
 -->
 <site>
-   <feature url="features/org.eclipse.scout.sdk-feature_0.0.0.qualifier.jar" id="org.eclipse.scout.sdk-feature" version="0.0.0">
+   <feature url="features/org.eclipse.scout.sdk-feature_6.0.0.M7.jar" id="org.eclipse.scout.sdk-feature" version="0.0.0">
       <category name="Eclipse Scout SDK"/>
    </feature>
-   <feature url="features/org.eclipse.scout.sdk-feature.source_0.0.0.qualifier.jar" id="org.eclipse.scout.sdk-feature.source" version="0.0.0">
+   <feature url="features/org.eclipse.scout.sdk-feature.source_6.0.0.M7.jar" id="org.eclipse.scout.sdk-feature.source" version="0.0.0">
       <category name="Eclipse Scout SDK"/>
    </feature>
    <category-def name="Eclipse Scout SDK" label="Scout Application Development SDK">
diff --git a/org.eclipse.scout.sdk-repository/pom.xml b/org.eclipse.scout.sdk-repository/pom.xml
index 3465a16..7778ffe 100644
--- a/org.eclipse.scout.sdk-repository/pom.xml
+++ b/org.eclipse.scout.sdk-repository/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk.p2</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk.p2/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk-settings/pom.xml b/org.eclipse.scout.sdk-settings/pom.xml
index 1a0e5ab..f3e84f9 100644
--- a/org.eclipse.scout.sdk-settings/pom.xml
+++ b/org.eclipse.scout.sdk-settings/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk-target/pom.xml b/org.eclipse.scout.sdk-target/pom.xml
index 7ced8a4..e1b2d0e 100644
--- a/org.eclipse.scout.sdk-target/pom.xml
+++ b/org.eclipse.scout.sdk-target/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk.p2</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk.p2/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk.core.s.test/pom.xml b/org.eclipse.scout.sdk.core.s.test/pom.xml
index 9b85da0..5046a15 100644
--- a/org.eclipse.scout.sdk.core.s.test/pom.xml
+++ b/org.eclipse.scout.sdk.core.s.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk.core.s/pom.xml b/org.eclipse.scout.sdk.core.s/pom.xml
index 9f7a25a..48470ba 100644
--- a/org.eclipse.scout.sdk.core.s/pom.xml
+++ b/org.eclipse.scout.sdk.core.s/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk.core.s/src/main/java/org/eclipse/scout/sdk/core/s/project/ScoutProjectNewHelper.java b/org.eclipse.scout.sdk.core.s/src/main/java/org/eclipse/scout/sdk/core/s/project/ScoutProjectNewHelper.java
index 1991dde..5f9ae0b 100644
--- a/org.eclipse.scout.sdk.core.s/src/main/java/org/eclipse/scout/sdk/core/s/project/ScoutProjectNewHelper.java
+++ b/org.eclipse.scout.sdk.core.s/src/main/java/org/eclipse/scout/sdk/core/s/project/ScoutProjectNewHelper.java
@@ -45,13 +45,13 @@
  */
 public final class ScoutProjectNewHelper {
 
-  public static final String SCOUT_ARCHETYPES_HELLOWORLD_VERSION = "6.0.0-SNAPSHOT";
+  public static final String SCOUT_ARCHETYPES_HELLOWORLD_VERSION = "6.0.0.M7";
   public static final String SCOUT_ARCHETYPES_HELLOWORLD_ARTIFACT_ID = "scout-helloworld-app";
   public static final String SCOUT_ARCHETYPES_GROUP_ID = "org.eclipse.scout.archetypes";
 
   public static final Pattern DISPLAY_NAME_PATTERN = Pattern.compile("[^\"\\/<>=:]+");
   public static final Pattern SYMBOLIC_NAME_PATTERN = Pattern.compile("^[a-z]{1}[a-z0-9_]{0,32}(\\.[a-z]{1}[a-z0-9_]{0,32}){0,16}$");
-  public static final String DEFAULT_JAVA_VERSION = "1.8";
+  public static final String DEFAULT_JAVA_VERSION = "6.0.0.M7";
 
   private ScoutProjectNewHelper() {
   }
diff --git a/org.eclipse.scout.sdk.core.test/pom.xml b/org.eclipse.scout.sdk.core.test/pom.xml
index 7826b5e..aac5027 100644
--- a/org.eclipse.scout.sdk.core.test/pom.xml
+++ b/org.eclipse.scout.sdk.core.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk.core/pom.xml b/org.eclipse.scout.sdk.core/pom.xml
index 446d529..e7af2c8 100644
--- a/org.eclipse.scout.sdk.core/pom.xml
+++ b/org.eclipse.scout.sdk.core/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk.p2/pom.xml b/org.eclipse.scout.sdk.p2/pom.xml
index fb170a4..ab557be 100644
--- a/org.eclipse.scout.sdk.p2/pom.xml
+++ b/org.eclipse.scout.sdk.p2/pom.xml
@@ -23,7 +23,7 @@
 
   <groupId>org.eclipse.scout.sdk</groupId>
   <artifactId>org.eclipse.scout.sdk.p2</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
+  <version>6.0.0.M7</version>
   <packaging>pom</packaging>
   <name>Eclipse Scout SDK P2</name>
   <description>Eclipse Scout SDK - Eclipse Features/Repository</description>
@@ -41,7 +41,7 @@
   <properties>
     <scout.base.version>6.0.0</scout.base.version>
     <base.version>${scout.base.version}</base.version>
-    <org.eclipse.scout.rt_version>6.0.0-SNAPSHOT</org.eclipse.scout.rt_version>
+    <org.eclipse.scout.rt_version>6.0.0.M7</org.eclipse.scout.rt_version>
   </properties>
 
   <dependencyManagement>
@@ -186,7 +186,7 @@
   <scm>
     <connection>scm:git:git://git.eclipse.org/gitroot/scout/org.eclipse.scout.sdk.git</connection>
     <developerConnection>scm:git:ssh://${eclipse_gerrit_username}@git.eclipse.org:29418/scout/org.eclipse.scout.sdk</developerConnection>
-    <tag>releases/6.0.x</tag>
+    <tag>6.0.0.M7</tag>
     <url>http://git.eclipse.org/c/scout/org.eclipse.scout.sdk.git/</url>
   </scm>
 
diff --git a/org.eclipse.scout.sdk.s2e.doc/pom.xml b/org.eclipse.scout.sdk.s2e.doc/pom.xml
index 6be95c8..ed11acf 100644
--- a/org.eclipse.scout.sdk.s2e.doc/pom.xml
+++ b/org.eclipse.scout.sdk.s2e.doc/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk.s2e.nls/pom.xml b/org.eclipse.scout.sdk.s2e.nls/pom.xml
index 97ae66d..54be1b4 100644
--- a/org.eclipse.scout.sdk.s2e.nls/pom.xml
+++ b/org.eclipse.scout.sdk.s2e.nls/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk.s2e.releng/pom.xml b/org.eclipse.scout.sdk.s2e.releng/pom.xml
index 0b2c668..ac3abf1 100644
--- a/org.eclipse.scout.sdk.s2e.releng/pom.xml
+++ b/org.eclipse.scout.sdk.s2e.releng/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk.s2e.test/pom.xml b/org.eclipse.scout.sdk.s2e.test/pom.xml
index d37518a..327c4e4 100644
--- a/org.eclipse.scout.sdk.s2e.test/pom.xml
+++ b/org.eclipse.scout.sdk.s2e.test/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk.s2e.ui/pom.xml b/org.eclipse.scout.sdk.s2e.ui/pom.xml
index 7a8296e..6c8aa85 100644
--- a/org.eclipse.scout.sdk.s2e.ui/pom.xml
+++ b/org.eclipse.scout.sdk.s2e.ui/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk.s2e/pom.xml b/org.eclipse.scout.sdk.s2e/pom.xml
index e2d7ae9..c9db4ba 100644
--- a/org.eclipse.scout.sdk.s2e/pom.xml
+++ b/org.eclipse.scout.sdk.s2e/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.scout.sdk</groupId>
     <artifactId>org.eclipse.scout.sdk</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0.M7</version>
     <relativePath>../org.eclipse.scout.sdk/pom.xml</relativePath>
   </parent>
 
diff --git a/org.eclipse.scout.sdk/pom.xml b/org.eclipse.scout.sdk/pom.xml
index d7deccc..e228a22 100644
--- a/org.eclipse.scout.sdk/pom.xml
+++ b/org.eclipse.scout.sdk/pom.xml
@@ -23,7 +23,7 @@
 
   <groupId>org.eclipse.scout.sdk</groupId>
   <artifactId>org.eclipse.scout.sdk</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
+  <version>6.0.0.M7</version>
   <packaging>pom</packaging>
   <name>Eclipse Scout SDK</name>
   <description>Eclipse Scout SDK</description>
@@ -53,7 +53,7 @@
   <properties>
     <scout.base.version>6.0.0</scout.base.version>
     <base.version>${scout.base.version}</base.version>
-    <org.eclipse.scout.rt_version>6.0.0-SNAPSHOT</org.eclipse.scout.rt_version>
+    <org.eclipse.scout.rt_version>6.0.0.M7</org.eclipse.scout.rt_version>
 
     <master_coverage_jacoco_destFile>${basedir}/../org.eclipse.scout.sdk/target/jacoco-all.exec</master_coverage_jacoco_destFile>
     <!-- Sonar properties -->
@@ -243,78 +243,78 @@
       <dependency>
         <groupId>org.eclipse.scout.sdk</groupId>
         <artifactId>org.eclipse.scout.sdk.core</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.scout.sdk</groupId>
         <artifactId>org.eclipse.scout.sdk.core.test</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
       </dependency>
 
       <dependency>
         <groupId>org.eclipse.scout.sdk</groupId>
         <artifactId>org.eclipse.scout.sdk.core.s</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
       </dependency>
 
       <dependency>
         <groupId>org.eclipse.scout.sdk</groupId>
         <artifactId>org.eclipse.scout.sdk.core.s.test</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
       </dependency>
 
       <dependency>
         <groupId>org.eclipse.scout.sdk.s2e</groupId>
         <artifactId>org.eclipse.scout.sdk.s2e</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.scout.sdk.s2e</groupId>
         <artifactId>org.eclipse.scout.sdk.s2e</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
         <groupId>org.eclipse.scout.sdk.s2e</groupId>
         <artifactId>org.eclipse.scout.sdk.s2e.doc</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.scout.sdk.s2e</groupId>
         <artifactId>org.eclipse.scout.sdk.s2e.doc</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
         <groupId>org.eclipse.scout.sdk.s2e</groupId>
         <artifactId>org.eclipse.scout.sdk.s2e.nls</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.scout.sdk.s2e</groupId>
         <artifactId>org.eclipse.scout.sdk.s2e.nls</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
         <groupId>org.eclipse.scout.sdk.s2e</groupId>
         <artifactId>org.eclipse.scout.sdk.s2e.ui</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.scout.sdk.s2e</groupId>
         <artifactId>org.eclipse.scout.sdk.s2e.ui</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
         <groupId>org.eclipse.scout.sdk.s2e</groupId>
         <artifactId>org.eclipse.scout.sdk.s2e.test</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0.M7</version>
       </dependency>
 
       <!-- Build Dependencies -->
@@ -701,7 +701,7 @@
   <scm>
     <connection>scm:git:git://git.eclipse.org/gitroot/scout/org.eclipse.scout.sdk.git</connection>
     <developerConnection>scm:git:ssh://${eclipse_gerrit_username}@git.eclipse.org:29418/scout/org.eclipse.scout.sdk</developerConnection>
-    <tag>releases/6.0.x</tag>
+    <tag>6.0.0.M7</tag>
     <url>http://git.eclipse.org/c/scout/org.eclipse.scout.sdk.git/</url>
   </scm>
 
diff --git a/scout-helloworld-app/pom.xml b/scout-helloworld-app/pom.xml
index c31eb26..79acc09 100644
--- a/scout-helloworld-app/pom.xml
+++ b/scout-helloworld-app/pom.xml
@@ -23,7 +23,7 @@
 
   <groupId>org.eclipse.scout.archetypes</groupId>
   <artifactId>scout-helloworld-app</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
+  <version>6.0.0.M7</version>
   <packaging>maven-archetype</packaging>
 
   <name>Scout Hello World Sample Application</name>
@@ -108,7 +108,7 @@
   <scm>
     <connection>scm:git:git://git.eclipse.org/gitroot/scout/org.eclipse.scout.sdk.git</connection>
     <developerConnection>scm:git:ssh://${eclipse_gerrit_username}@git.eclipse.org:29418/scout/org.eclipse.scout.sdk</developerConnection>
-    <tag>releases/6.0.x</tag>
+    <tag>6.0.0.M7</tag>
     <url>http://git.eclipse.org/c/scout/org.eclipse.scout.sdk.git/</url>
   </scm>
 
diff --git a/scout-helloworld-app/src/main/resources/archetype-resources/__rootArtifactId__/pom.xml b/scout-helloworld-app/src/main/resources/archetype-resources/__rootArtifactId__/pom.xml
index 0853aaf..e23acb5 100644
--- a/scout-helloworld-app/src/main/resources/archetype-resources/__rootArtifactId__/pom.xml
+++ b/scout-helloworld-app/src/main/resources/archetype-resources/__rootArtifactId__/pom.xml
@@ -20,7 +20,7 @@
   <properties>
     <${groupId}.${rootArtifactId}.version>${project.version}</${groupId}.${rootArtifactId}.version>
     <jdk.source.version>${javaVersion}</jdk.source.version>
-    <org.eclipse.scout.rt_version>6.0.0-SNAPSHOT</org.eclipse.scout.rt_version>
+    <org.eclipse.scout.rt_version>6.0.0.M7</org.eclipse.scout.rt_version>
   </properties>
 
   <modules>
diff --git a/updatesite-maven-plugin/pom.xml b/updatesite-maven-plugin/pom.xml
index 8e16893..36c4044 100644
--- a/updatesite-maven-plugin/pom.xml
+++ b/updatesite-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
 
   <groupId>org.eclipse.scout.sdk</groupId>
   <artifactId>updatesite-maven-plugin</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
+  <version>6.0.0.M7</version>
   <packaging>maven-plugin</packaging>
   <name>${project.groupId}:${project.artifactId}</name>