diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 762aeec..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributing to Eclipse GLSP
-
-Thank you for your interest in the GLSP project! The following is a set of guidelines for contributing to GLSP.
-
-## Code of Conduct
-
-This project is governed by the [Eclipse Community Code of Conduct](https://github.com/eclipse/.github/blob/master/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code.
-
-## Communication
-
-The following communication channels are available:
-
- * [GitHub issues](https://github.com/eclipse-glsp/glsp/issues) - for bug reports, feature requests, etc.
- * [Eclipse community forum](https://www.eclipse.org/forums/index.php/f/443/) - for questions
- * [Developer mailing list](https://accounts.eclipse.org/mailing-list/glsp-dev) - for organizational issues (e.g. elections of new committers)
-
-In case you have a question, please look into the [documentation in the Wiki](https://github.com/eclipse-glsp/glsp/wiki) first. If you don't find any answer there, feel free to use the chat, forum or issues to get help.
-
-Please create new issues only in the [GLSP umbrella project](https://github.com/eclipse-glsp/glsp), as we are tracking the issues for all components of GLSP there.
-
-## How to Contribute
-
-Before your pull request can be accepted, you must electronically sign the [Eclipse Contributor Agreement](https://www.eclipse.org/legal/ECA.php).
-
-Unless you are an [elected committer of the GLSP project](https://projects.eclipse.org/projects/ecd.glsp/who), you must include a `Signed-off-by` line in the commit message. This line can be generated with the [-s flag of git commit](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt--s). By doing this you confirm that your contribution conforms to the Eclipse Contributor Agreement.
-
-For more information, see the [Eclipse Foundation Project Handbook](https://www.eclipse.org/projects/handbook/#resources-commit).
diff --git a/plugins/org.eclipse.emfcloud.modelserver.glsp.integration/pom.xml b/plugins/org.eclipse.emfcloud.modelserver.glsp.integration/pom.xml
index 7d5f4f9..f6ccbc7 100644
--- a/plugins/org.eclipse.emfcloud.modelserver.glsp.integration/pom.xml
+++ b/plugins/org.eclipse.emfcloud.modelserver.glsp.integration/pom.xml
@@ -66,12 +66,12 @@
 				<dependency>
 					<groupId>org.eclipse.emfcloud.modelserver</groupId>
 					<artifactId>org.eclipse.emfcloud.modelserver.emf</artifactId>
-					<version>${target.version}</version>
+					<version>${modelserver.version}</version>
 				</dependency>
 				<dependency>
 					<groupId>org.eclipse.emfcloud.modelserver.glsp</groupId>
 					<artifactId>org.eclipse.emfcloud.modelserver.glsp.notation.model</artifactId>
-					<version>${target.version}</version>
+					<version>${modelserver.version}</version>
 				</dependency>
 				<dependency>
 					<groupId>org.eclipse.glsp</groupId>
diff --git a/plugins/org.eclipse.emfcloud.modelserver.glsp.notation.model/pom.xml b/plugins/org.eclipse.emfcloud.modelserver.glsp.notation.model/pom.xml
index f7e0b07..bcf4c1e 100644
--- a/plugins/org.eclipse.emfcloud.modelserver.glsp.notation.model/pom.xml
+++ b/plugins/org.eclipse.emfcloud.modelserver.glsp.notation.model/pom.xml
@@ -65,12 +65,12 @@
 				<dependency>
 					<groupId>org.eclipse.emfcloud.modelserver</groupId>
 					<artifactId>org.eclipse.emfcloud.modelserver.emf</artifactId>
-					<version>${target.version}</version>
+					<version>${modelserver.version}</version>
 				</dependency>
 					<dependency>
 					<groupId>org.eclipse.emfcloud.modelserver</groupId>
 					<artifactId>org.eclipse.emfcloud.modelserver.client</artifactId>
-					<version>${target.version}</version>
+					<version>${modelserver.version}</version>
 				</dependency>
 				<dependency>
 					<groupId>org.eclipse.glsp</groupId>
diff --git a/pom.xml b/pom.xml
index 2bd2d50..e170dec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	<version>0.7.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>EMF.cloud Modelserver GLSP Integration Parent</name>
-
+	<description>EMF.cloud Modelserver GLSP Integration Parent pom</description>
 	<!-- Required metadata for deploying releases to mvn central -->
 
 	<url>https://www.eclipse.org/emfcloud/</url>
@@ -63,9 +63,7 @@
 		<java.source>11</java.source>
 		<java.target>11</java.target>
 
-		<!-- Target: version used to reference target platform from our releng 
-			bundle -->
-		<target.version>0.7.0-SNAPSHOT</target.version>
+
 
 		<!-- Deployment: used by the maven-deploy-plugin -->
 		<maven.deploy.skip>true</maven.deploy.skip>
@@ -80,7 +78,7 @@
 		<maven.clean.version>3.1.0</maven.clean.version>
 		<maven.checkstyle.version>3.1.1</maven.checkstyle.version>
 		<puppycrawl.checkstyle.version>8.39</puppycrawl.checkstyle.version>
-		<emfcloud.checkstyle.version>0.1.0-SNAPSHOT</emfcloud.checkstyle.version>
+		<emfcloud.checkstyle.version>0.1.0-RC1</emfcloud.checkstyle.version>
 
 		<maven.resources.version>3.2.0</maven.resources.version>
 		<maven.surefire.version>3.0.0-M5</maven.surefire.version>
@@ -98,6 +96,7 @@
 
 		<emf.edit.version>2.16.0</emf.edit.version>
 		<glsp.version>0.9.0-SNAPSHOT</glsp.version>
+		<modelserver.version>0.7.0-SNAPSHOT</modelserver.version>
 		<emf.transaction.version>1.4.0-v20100331-1738</emf.transaction.version>
 	</properties>
 
@@ -129,7 +128,9 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 
-
+			<modules>
+				<module>releng</module>
+			</modules>
 
 			<build>
 				<pluginManagement>
@@ -162,6 +163,16 @@
 							<artifactId>tycho-versions-plugin</artifactId>
 							<version>${tycho.version}</version>
 						</plugin>
+						<plugin>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-p2-repository-plugin</artifactId>
+							<version>${tycho.version}</version>
+						</plugin>
+						<plugin>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-p2-plugin</artifactId>
+							<version>${tycho.version}</version>
+						</plugin>
 					</plugins>
 				</pluginManagement>
 				<plugins>
@@ -199,6 +210,20 @@
 									<goal>plugin-source</goal>
 								</goals>
 							</execution>
+							<execution>
+								<id>feature-source</id>
+								<phase>package</phase>
+								<goals>
+									<goal>feature-source</goal>
+								</goals>
+								<configuration>
+									<excludes>
+										<plugin id="org.apache.batik.pdf" />
+										<plugin id="org.eclipse.wst.common.project.facet.core" />
+										<plugin id="org.eclipse.emfcloud.modelserver.lib" />
+									</excludes>
+								</configuration>
+							</execution>
 						</executions>
 					</plugin>
 					<plugin>
@@ -229,63 +254,11 @@
 									<groupId>org.eclipse.emfcloud.modelserver.glsp</groupId>
 									<artifactId>org.eclipse.emfcloud.modelserver.glsp.parent</artifactId>
 									<classifier>releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition</classifier>
-									<version>${target.version}</version>
+									<version>${project.version}</version>
 								</artifact>
 							</target>
 						</configuration>
 					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-		<!-- P2-Release Profile: Used to build and Eclipse update site. Should 
-			only be used in conjunction with the P2 Profile -->
-		<profile>
-			<id>p2-release</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			
-			<modules>
-				<module>releng</module>
-			</modules>
-			
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>tycho-p2-repository-plugin</artifactId>
-							<version>${tycho.version}</version>
-						</plugin>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>tycho-p2-plugin</artifactId>
-							<version>${tycho.version}</version>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-source-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>feature-source</id>
-								<phase>package</phase>
-								<goals>
-									<goal>feature-source</goal>
-								</goals>
-								<configuration>
-									<excludes>
-										<plugin id="org.apache.batik.pdf" />
-										<plugin id="org.eclipse.wst.common.project.facet.core" />
-										<plugin id="org.eclipse.emfcloud.modelserver.lib" />
-									</excludes>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>tycho-p2-plugin</artifactId>
diff --git a/releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition.tpd b/releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition.tpd
index b558634..e865658 100644
--- a/releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition.tpd
+++ b/releng/org.eclipse.emfcloud.modelserver.glsp.releng.target/targetdefinition.tpd
@@ -7,7 +7,7 @@ location "https://download.eclipse.org/glsp/server/p2/nightly/0.9/0.9.0.20210421
 }
 
 location "https://download.eclipse.org/emfcloud/modelserver/p2/nightly/0.7/0.7.0.202105141035/" {
-	org.eclipse.emfcloud.modelserver.feature.feature.group [0.7.0,0.8.0)
+	org.eclipse.emfcloud.modelserver.feature.feature.group [0.7.0,1.0.0)
 }
 
 location "http://download.eclipse.org/releases/2020-09" {
diff --git a/releng/pom.xml b/releng/pom.xml
index 4a41c81..e87f921 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -19,13 +19,4 @@
 		<module>org.eclipse.emfcloud.modelserver.glsp.repository</module>
 	</modules>
 
-	<profiles>
-		<profile>
-			<id>p2-release</id>
-			<modules>
-				<module>org.eclipse.emfcloud.modelserver.glsp.repository</module>
-			</modules>
-		</profile>
-	</profiles>
-
 </project>