diff --git a/README.md b/README.md
index b4fc807..09cb4bf 100755
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@
 
 ### Building against a specific Eclipse Release ###
 
-By default SysML16 is build against latest stable Eclipse Release Train (2020-12).
+By default SysML16 is built against latest stable Eclipse Release Train.
 
 ### Building for Eclipser server ###
 
diff --git a/features/org.eclipse.papyrus.sysml16.feature/feature.xml b/features/org.eclipse.papyrus.sysml16.feature/feature.xml
index ea3a07d..a33e59c 100644
--- a/features/org.eclipse.papyrus.sysml16.feature/feature.xml
+++ b/features/org.eclipse.papyrus.sysml16.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.sysml16.feature"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.papyrus.sysml16.ui"
       license-feature="org.eclipse.license"
@@ -23,7 +23,7 @@
    </copyright>
 
    <requires>
-      <import feature="org.eclipse.papyrus.sdk.feature" version="5.0.0" match="compatible"/>
+      <import feature="org.eclipse.papyrus.sdk.feature" version="5.1.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.papyrus.sysml16.feature/pom.xml b/features/org.eclipse.papyrus.sysml16.feature/pom.xml
index 1ee9b96..0fee18c 100644
--- a/features/org.eclipse.papyrus.sysml16.feature/pom.xml
+++ b/features/org.eclipse.papyrus.sysml16.feature/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
@@ -8,6 +9,7 @@
 		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml16.feature</artifactId>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<name>org.eclipse.papyrus.sysml16.feature</name>
 	<description>This plugin gather all SysML 1.6 plugins to define a fully functionnal DSML editor.</description>
diff --git a/features/org.eclipse.papyrus.sysml16.rcp.feature/feature.xml b/features/org.eclipse.papyrus.sysml16.rcp.feature/feature.xml
index d911ec8..cfcf85c 100644
--- a/features/org.eclipse.papyrus.sysml16.rcp.feature/feature.xml
+++ b/features/org.eclipse.papyrus.sysml16.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.sysml16.rcp.feature"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
diff --git a/features/org.eclipse.papyrus.sysml16.rcp.feature/pom.xml b/features/org.eclipse.papyrus.sysml16.rcp.feature/pom.xml
index 2374242..68cdee5 100644
--- a/features/org.eclipse.papyrus.sysml16.rcp.feature/pom.xml
+++ b/features/org.eclipse.papyrus.sysml16.rcp.feature/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
@@ -8,6 +9,7 @@
 		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.sysml16.rcp.feature</artifactId>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<name>org.eclipse.papyrus.sysml16.rcp.feature</name>
 	<description>This plugin packages the rcp in a feature to be used as it in the SysML 1.6 product.</description>
diff --git a/features/org.eclipse.papyrus.sysml16.requirements.extension.feature/feature.xml b/features/org.eclipse.papyrus.sysml16.requirements.extension.feature/feature.xml
index 264aa32..597a220 100644
--- a/features/org.eclipse.papyrus.sysml16.requirements.extension.feature/feature.xml
+++ b/features/org.eclipse.papyrus.sysml16.requirements.extension.feature/feature.xml
@@ -23,8 +23,8 @@
    </copyright>
 
    <requires>
-      <import feature="org.eclipse.papyrus.sdk.feature" version="5.0.0" match="compatible"/>
-      <import feature="org.eclipse.papyrus.sysml16.feature" version="0.0.0" match="compatible"/>
+      <import feature="org.eclipse.papyrus.sdk.feature" version="5.1.0" match="compatible"/>
+      <import feature="org.eclipse.papyrus.sysml16.feature" version="2.1.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/features/pom.xml b/features/pom.xml
index 4a511c6..cf7ab83 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>org.eclipse.papyrus.sysml16.parent</artifactId>
 		<groupId>org.eclipse.papyrus.sysml</groupId>
 		<version>2.0.0-SNAPSHOT</version>
-	</parent>	
+	</parent>
 	<artifactId>org.eclipse.papyrus.sysml16.features</artifactId>
 	<packaging>pom</packaging>
 	<name>SysML Features</name>
@@ -15,7 +16,7 @@
 		<module>org.eclipse.papyrus.sysml16.feature</module>
 		<module>org.eclipse.papyrus.sysml16.requirements.extension.feature</module>
 	</modules>
-	
+
 	<profiles>
 		<profile>
 			<id>product</id>
diff --git a/pom.xml b/pom.xml
index 4e31f3f..090ba3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,12 +26,14 @@
 		<component.bugzilla.name>SysML</component.bugzilla.name>
 		<component.rcp.name>org.eclipse.papyrus.sysml16.rcp</component.rcp.name>
 		<component.servicetype>org.eclipse.papyrus.sysml16.service.types</component.servicetype>
-		<eclipse.targetrelease>2020-12</eclipse.targetrelease>
-		<target.version>${project.version}</target.version>
-		<target.groupId>${project.groupId}</target.groupId>
-		<target.artifactId>org.eclipse.papyrus.sysml16.targetplatform</target.artifactId>
 		<tycho.scmUrl>${project.scm.connection}</tycho.scmUrl>
 
+		<!-- platform specific properties -->
+		<eclipse.targetrelease>2021-03</eclipse.targetrelease>
+		<target.version>2.0.0-SNAPSHOT</target.version> 
+		<target.groupId>org.eclipse.papyrus.sysml</target.groupId>
+		<target.artifactId>org.eclipse.papyrus.sysml16.targetplatform</target.artifactId>
+
 		<tycho.version>2.0.0</tycho.version>
 		<tychoExtras.version>2.0.0</tychoExtras.version>
 		<xtext.version>2.23.0</xtext.version>
@@ -48,16 +50,6 @@
 		<java.target.version>11</java.target.version>
 	</properties>
 
-	<mailingLists>
-		<mailingList>
-			<name>Papyrus SysML users Mailing List</name>
-			<post>papyrus-sysml-users@eclipse.org</post>
-			<subscribe>https://dev.eclipse.org/mailman/listinfo/papyrus-sysml-users/</subscribe>
-			<unsubscribe>https://dev.eclipse.org/mailman/listinfo/papyrus-sysml-users/</unsubscribe>
-			<archive>https://dev.eclipse.org/mailman/listinfo/papyrus-sysml-users/</archive>
-		</mailingList>
-	</mailingLists>
-
 	<ciManagement>
 		<system>Hudson</system>
 		<url>https://hudson.eclipse.org/papyrus/view/${component.hudson.tabname}/</url>
diff --git a/releng/org.eclipse.papyrus.sysml16.p2/category.xml b/releng/org.eclipse.papyrus.sysml16.p2/category.xml
index d6a5467..2c87c97 100644
--- a/releng/org.eclipse.papyrus.sysml16.p2/category.xml
+++ b/releng/org.eclipse.papyrus.sysml16.p2/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.papyrus.sysml16.feature_2.0.0.qualifier.jar" id="org.eclipse.papyrus.sysml16.feature" version="2.0.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.sysml16.feature_2.1.0.qualifier.jar" id="org.eclipse.papyrus.sysml16.feature" version="2.1.0.qualifier">
       <category name="org.eclipse.papyrus.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.sysml16.feature.source_2.0.0.qualifier.jar" id="org.eclipse.papyrus.sysml16.feature.source" version="2.0.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.sysml16.feature.source_2.1.0.qualifier.jar" id="org.eclipse.papyrus.sysml16.feature.source" version="2.1.0.qualifier">
       <category name="org.eclipse.papyrus.category"/>
    </feature>
    <feature url="features/org.eclipse.papyrus.sysml16.requirements.extension.feature_2.0.0.qualifier.jar" id="org.eclipse.papyrus.sysml16.requirements.extension.feature" version="2.0.0.qualifier">
@@ -12,10 +12,10 @@
    <feature url="features/org.eclipse.papyrus.sysml16.requirements.extension.feature.source_2.0.0.qualifier.jar" id="org.eclipse.papyrus.sysml16.requirements.extension.feature.source" version="2.0.0.qualifier">
       <category name="org.eclipse.papyrus.category"/>
    </feature>
-   <category-def name="org.eclipse.papyrus.category" label="Papyrus SysML Category">
+   <category-def name="org.eclipse.papyrus.category" label="Papyrus SysML 1.6 Category">
       <description>
-         Papyrus SysML Category
+         Papyrus SysML 1.6 Category
       </description>
    </category-def>
-   <repository-reference location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03/" enabled="true" />
 </site>
diff --git a/releng/org.eclipse.papyrus.sysml16.product/category.xml b/releng/org.eclipse.papyrus.sysml16.product/category.xml
deleted file mode 100644
index e2a689c..0000000
--- a/releng/org.eclipse.papyrus.sysml16.product/category.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/org.eclipse.papyrus.sysml16.feature_2.0.0.qualifier.jar" id="org.eclipse.papyrus.sysml16.feature" version="2.0.0.qualifier"/>
-</site>
diff --git a/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product b/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
index 9a07060..1315aa1 100644
--- a/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
+++ b/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
@@ -138,8 +138,7 @@
    </configurations>
 
    <repositories>
-      <repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml16/" enabled="true" />
-      <repository location="http://https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" enabled="true" />
+      <repository location="http://https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03" enabled="true" />
    </repositories>
 
    <preferencesInfo>
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target
index f1fd175..ab3dcc9 100755
--- a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target
+++ b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="SysML 1.6 - 2020-12" sequenceNumber="1606314340">
+<target name="SysML 1.6 - 2021-03" sequenceNumber="1622626795">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -10,17 +10,17 @@
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
-      <repository id="eclipse-2020-12" location="http://download.eclipse.org/releases/2020-12/"/>
+      <repository id="eclipse-2021-03" location="http://download.eclipse.org/releases/2021-03/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-      <repository id="eclipse-license" location="https://download.eclipse.org/cbi/updates/license/"/>
+      <repository id="license-feature" location="https://download.eclipse.org/cbi/updates/license/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
-      <repository id="Papyrus-2020-12" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-12/5.0.0/"/>
+      <repository id="Papyrus-2021-03" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03/"/>
     </location>
   </locations>
 </target>
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
index 3b92936..b1b25bd 100644
--- a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
+++ b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
@@ -1,6 +1,6 @@
-target "SysML 1.6 - 2020-12" with source requirements
+target "SysML 1.6 - 2021-03" with source requirements
 
-location "http://download.eclipse.org/releases/2020-12/" eclipse-2020-12 {
+location "http://download.eclipse.org/releases/2021-03/" eclipse-2021-03 {
  org.eclipse.platform.feature.group lazy
  org.eclipse.rcp.feature.group lazy
  org.eclipse.jdt.feature.group lazy
@@ -9,11 +9,11 @@
  org.eclipse.ocl.uml.feature.group lazy
 }
 
-location "https://download.eclipse.org/cbi/updates/license/" eclipse-license {
+location "https://download.eclipse.org/cbi/updates/license/" license-feature{
  org.eclipse.license.feature.group lazy
 }
 
-location "https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-12/5.0.0/" Papyrus-2020-12 {
+location "https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03/" Papyrus-2021-03 {
  org.eclipse.papyrus.junit.feature.feature.group lazy
  org.eclipse.papyrus.sdk.feature.feature.group lazy
  org.eclipse.papyrus.toolsmiths.feature.feature.group lazy