diff --git a/features/org.eclipse.papyrus.moka.feature/pom.xml b/features/org.eclipse.papyrus.moka.feature/pom.xml
index c6ae754..489d60d 100644
--- a/features/org.eclipse.papyrus.moka.feature/pom.xml
+++ b/features/org.eclipse.papyrus.moka.feature/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
 
@@ -28,7 +29,8 @@
 						</goals>
 						<configuration>
 							<excludes>
-								<plugin id="org.eclipse.equinox.weaving.aspectj"/>
+								<plugin id="org.eclipse.equinox.weaving.aspectj" />
+								<plugin id="org.eclipse.equinox.weaving.hook" />
 							</excludes>
 						</configuration>
 					</execution>
diff --git a/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product b/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product
index ae4808a..7f7aea9 100644
--- a/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product
+++ b/products/org.eclipse.papyrus.moka.fmu.product/fmu_rcp.product
@@ -3,6 +3,7 @@
 
 <product name="FMU Embedded Moka" uid="fmu_embedded_moka" application="org.eclipse.papyrus.moka.fmu.rcpapplication" version="0.1" useFeatures="false" includeLaunchers="true">
 
+
    <configIni use="default">
    </configIni>
 
@@ -17,12 +18,14 @@
 
    <windowImages/>
 
+
    <launcher name="fmu_rcp">
       <win useIco="false">
          <bmp/>
       </win>
    </launcher>
 
+
    <vm>
    </vm>
 
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
index c9b6352..1e0194e 100644
--- 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Moka Photon Target Platform" sequenceNumber="1534945949">
+<target name="Moka Photon Target Platform" sequenceNumber="1539165333">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -9,12 +9,15 @@
       <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/photon"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2018-09"/>
+    </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"/>
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/photon/"/>
+      <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"/>
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
index e1ee265..71b6005 100644
--- 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
@@ -1,25 +1,28 @@
 target "Moka Photon Target Platform" with source requirements
 
-location "http://download.eclipse.org/releases/photon" 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 "http://download.eclipse.org/releases/2018-09" 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 "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/photon/" papyrus {
-	org.eclipse.papyrus.junit.feature.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 "http://download.eclipse.org/tools/ajdt/48/dev/update/" aspectj{
+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/S20180820175350/repository" orbit{
+location "http://download.eclipse.org/tools/orbit/downloads/drops/S20180820175350/repository" orbit {
 	com.fasterxml.jackson.core.jackson-annotations lazy
 	com.fasterxml.jackson.core.jackson-core lazy
 	com.github.jnr.constants lazy
@@ -28,7 +31,7 @@
 	com.github.jnr.jffi lazy
 }
 
-location "http://download.eclipse.org/nebula/releases/2.0.1" nebula{
+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
 }
\ No newline at end of file