diff --git a/releng/org.eclipse.papyrus.moka.configuration/pom.xml b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
index bc37382..73643a7 100644
--- a/releng/org.eclipse.papyrus.moka.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.moka.configuration/pom.xml
@@ -29,7 +29,7 @@
 		<component.bugzilla.name>Moka</component.bugzilla.name>
 		<component.package.rootname>org.eclipse.papyrus.moka</component.package.rootname>
 		<component.apibaseline.url>http://download.eclipse.org/modeling/mdt/papyrus/components/moka/</component.apibaseline.url>
-		<eclipse.targetrelease>photon</eclipse.targetrelease>
+		<eclipse.targetrelease>2019-03</eclipse.targetrelease>
 		<target.version>4.0.0-SNAPSHOT</target.version>
 	</properties>
 
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/.project b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/.project
similarity index 84%
copy from releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/.project
copy to releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/.project
index a96de1d..e87e563 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/.project
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.moka.targetplatform.photon</name>
+	<name>org.eclipse.papyrus.moka.targetplatform.2019-03</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/org.eclipse.papyrus.moka.targetplatform.2019-03.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/org.eclipse.papyrus.moka.targetplatform.2019-03.target
new file mode 100644
index 0000000..217e5db
--- /dev/null
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/org.eclipse.papyrus.moka.targetplatform.2019-03.target
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka 2019-03 Target Platform" sequenceNumber="1547738508">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <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"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2018-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="papyrus" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03/4.3.0/main/"/>
+    </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"/>
+      <repository id="papyrus-toolsmith" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03/4.3.0/toolsmiths/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.aspectj.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ajdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="0.0.0"/>
+      <repository id="aspectj" location="http://download.eclipse.org/tools/ajdt/48/dev/update/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
+      <unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
+      <unit id="com.github.jnr.constants" version="0.0.0"/>
+      <unit id="com.github.jnr.enxio" version="0.0.0"/>
+      <unit id="com.github.jnr.ffi" version="0.0.0"/>
+      <unit id="com.github.jnr.jffi" version="0.0.0"/>
+      <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="0.0.0"/>
+      <repository id="nebula" location="http://download.eclipse.org/nebula/releases/2.0.1"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
+      <repository id="sysml" location="https://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/2018-09/"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/org.eclipse.papyrus.moka.targetplatform.2019-03.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/org.eclipse.papyrus.moka.targetplatform.2019-03.tpd
new file mode 100644
index 0000000..f7905ba
--- /dev/null
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/org.eclipse.papyrus.moka.targetplatform.2019-03.tpd
@@ -0,0 +1,40 @@
+target "Moka 2019-03 Target Platform" with source requirements
+
+location "http://download.eclipse.org/releases/2019-03" eclipse {
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.rcp.feature.group lazy
+	org.eclipse.jdt.feature.group lazy
+	org.eclipse.equinox.p2.discovery.feature.feature.group lazy
+	org.eclipse.equinox.executable.feature.group lazy
+}
+location "https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03/4.3.0/main/" papyrus {
+	org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
+
+location "https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03/4.3.0/toolsmiths/" papyrus-toolsmith {
+	org.eclipse.papyrus.junit.feature.feature.group lazy
+}
+
+location "http://download.eclipse.org/tools/ajdt/48/dev/update/" aspectj {
+	org.aspectj.feature.group lazy
+	org.eclipse.ajdt.feature.group lazy
+	org.eclipse.equinox.weaving.sdk.feature.group lazy
+}
+
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository" orbit {
+	com.fasterxml.jackson.core.jackson-annotations lazy
+	com.fasterxml.jackson.core.jackson-core lazy
+	com.github.jnr.constants lazy
+	com.github.jnr.enxio lazy
+	com.github.jnr.ffi lazy
+	com.github.jnr.jffi lazy
+}
+
+location "http://download.eclipse.org/nebula/releases/2.0.1" nebula {
+	org.eclipse.nebula.widgets.xviewer.feature.feature.group lazy
+	org.eclipse.nebula.visualization.feature.feature.group lazy
+}
+
+location "https://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/2018-09/" sysml {
+	org.eclipse.papyrus.sysml14.feature.feature.group lazy
+}
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/pom.xml
similarity index 83%
copy from releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml
copy to releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/pom.xml
index fa5a51e..4cb3bed 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.2019-03/pom.xml
@@ -10,8 +10,8 @@
 	</parent>
 	
 	<!-- POM description -->
-	<artifactId>org.eclipse.papyrus.moka.targetplatform.photon</artifactId>
+	<artifactId>org.eclipse.papyrus.moka.targetplatform.2019-03</artifactId>
 	<packaging>eclipse-target-definition</packaging>
-	<name>Moka Photon Target Platform</name>
+	<name>Moka 2019-03 Target Platform</name>
 	
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/.project b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/.project
similarity index 84%
rename from releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/.project
rename to releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/.project
index a96de1d..bc24655 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/.project
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.moka.targetplatform.photon</name>
+	<name>org.eclipse.papyrus.moka.targetplatform.master</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/org.eclipse.papyrus.moka.targetplatform.master.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/org.eclipse.papyrus.moka.targetplatform.master.target
new file mode 100644
index 0000000..af778f2
--- /dev/null
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/org.eclipse.papyrus.moka.targetplatform.master.target
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Moka Master Target Platform" sequenceNumber="1547738508">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <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"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2018-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+      <repository id="papyrus" location="https://hudson.eclipse.org/papyrus/view/Master/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"/>
+    </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"/>
+      <repository id="papyrus-toolsmith" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Toolsmiths/lastSuccessfulBuild/artifact/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.aspectj.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ajdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="0.0.0"/>
+      <repository id="aspectj" location="http://download.eclipse.org/tools/ajdt/48/dev/update/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
+      <unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
+      <unit id="com.github.jnr.constants" version="0.0.0"/>
+      <unit id="com.github.jnr.enxio" version="0.0.0"/>
+      <unit id="com.github.jnr.ffi" version="0.0.0"/>
+      <unit id="com.github.jnr.jffi" version="0.0.0"/>
+      <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="0.0.0"/>
+      <repository id="nebula" location="http://download.eclipse.org/nebula/releases/2.0.1"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
+      <repository id="sysml" location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/org.eclipse.papyrus.moka.targetplatform.master.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/org.eclipse.papyrus.moka.targetplatform.master.tpd
new file mode 100644
index 0000000..0ae0ac7
--- /dev/null
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/org.eclipse.papyrus.moka.targetplatform.master.tpd
@@ -0,0 +1,40 @@
+target "Moka Master Target Platform" with source requirements
+
+location "http://download.eclipse.org/releases/2018-12" eclipse {
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.rcp.feature.group lazy
+	org.eclipse.jdt.feature.group lazy
+	org.eclipse.equinox.p2.discovery.feature.feature.group lazy
+	org.eclipse.equinox.executable.feature.group lazy
+}
+location "https://hudson.eclipse.org/papyrus/view/Master/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/" papyrus {
+	org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
+
+location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Toolsmiths/lastSuccessfulBuild/artifact/repository/" papyrus-toolsmith {
+	org.eclipse.papyrus.junit.feature.feature.group lazy
+}
+
+location "http://download.eclipse.org/tools/ajdt/48/dev/update/" aspectj {
+	org.aspectj.feature.group lazy
+	org.eclipse.ajdt.feature.group lazy
+	org.eclipse.equinox.weaving.sdk.feature.group lazy
+}
+
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository" orbit {
+	com.fasterxml.jackson.core.jackson-annotations lazy
+	com.fasterxml.jackson.core.jackson-core lazy
+	com.github.jnr.constants lazy
+	com.github.jnr.enxio lazy
+	com.github.jnr.ffi lazy
+	com.github.jnr.jffi lazy
+}
+
+location "http://download.eclipse.org/nebula/releases/2.0.1" nebula {
+	org.eclipse.nebula.widgets.xviewer.feature.feature.group lazy
+	org.eclipse.nebula.visualization.feature.feature.group lazy
+}
+
+location "https://hudson.eclipse.org/papyrus/job/papyrus-sysml-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/" sysml {
+	org.eclipse.papyrus.sysml14.feature.feature.group lazy
+}
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/pom.xml
similarity index 85%
rename from releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml
rename to releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/pom.xml
index fa5a51e..4573c33 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/pom.xml
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.master/pom.xml
@@ -10,8 +10,8 @@
 	</parent>
 	
 	<!-- POM description -->
-	<artifactId>org.eclipse.papyrus.moka.targetplatform.photon</artifactId>
+	<artifactId>org.eclipse.papyrus.moka.targetplatform.master</artifactId>
 	<packaging>eclipse-target-definition</packaging>
-	<name>Moka Photon Target Platform</name>
+	<name>Moka Master Target Platform</name>
 	
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
deleted file mode 100644
index 92e6b87..0000000
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Moka Photon Target Platform" sequenceNumber="1547738508">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-      <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"/>
-      <repository id="eclipse" location="http://download.eclipse.org/releases/2018-12"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus" location="https://hudson.eclipse.org/papyrus/view/Master/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"/>
-    </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"/>
-      <repository id="papyrus-toolsmith" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Toolsmiths/lastSuccessfulBuild/artifact/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.aspectj.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.ajdt.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="0.0.0"/>
-      <repository id="aspectj" location="http://download.eclipse.org/tools/ajdt/48/dev/update/"/>
-    </location>
-  </locations>
-</target>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
deleted file mode 100644
index c9473b8..0000000
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
+++ /dev/null
@@ -1,22 +0,0 @@
-target "Moka Photon Target Platform" with source requirements
-
-location "http://download.eclipse.org/releases/2018-12" eclipse {
-	org.eclipse.platform.feature.group lazy
-	org.eclipse.rcp.feature.group lazy
-	org.eclipse.jdt.feature.group lazy
-	org.eclipse.equinox.p2.discovery.feature.feature.group lazy
-	org.eclipse.equinox.executable.feature.group lazy
-}
-location "https://hudson.eclipse.org/papyrus/view/Master/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/" papyrus {
-	org.eclipse.papyrus.sdk.feature.feature.group lazy
-}
-
-location "https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Toolsmiths/lastSuccessfulBuild/artifact/repository/" papyrus-toolsmith {
-	org.eclipse.papyrus.junit.feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/tools/ajdt/48/dev/update/" aspectj {
-	org.aspectj.feature.group lazy
-	org.eclipse.ajdt.feature.group lazy
-	org.eclipse.equinox.weaving.sdk.feature.group lazy
-}
diff --git a/releng/platforms/pom.xml b/releng/platforms/pom.xml
index 71c79a1..b2ce2a8 100644
--- a/releng/platforms/pom.xml
+++ b/releng/platforms/pom.xml
@@ -17,7 +17,8 @@
 
 	<!-- Modules to build -->
 	<modules>
-		<module>org.eclipse.papyrus.moka.targetplatform.photon</module>
+		<module>org.eclipse.papyrus.moka.targetplatform.master</module>
+		<module>org.eclipse.papyrus.moka.targetplatform.2019-03</module>
 	</modules>
 
-</project>
\ No newline at end of file
+</project>