diff --git a/features/org.eclipse.papyrus.moka.feature/feature.xml b/features/org.eclipse.papyrus.moka.feature/feature.xml
index eb96713..5230dd9 100644
--- a/features/org.eclipse.papyrus.moka.feature/feature.xml
+++ b/features/org.eclipse.papyrus.moka.feature/feature.xml
@@ -68,7 +68,7 @@
       <import plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.9.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.editor" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.emf.common.ui" version="2.18.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.uml.diagram.common" version="4.0.0" match="compatible"/>
+      <import plugin="org.eclipse.papyrus.uml.diagram.common" version="5.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.infra.services.validation" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.ui.tracepoint.view" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.moka.trace.interfaces" version="4.0.0" match="compatible"/>
diff --git a/plugins/org.eclipse.papyrus.moka.kernel.animation/META-INF/MANIFEST.MF b/plugins/org.eclipse.papyrus.moka.kernel.animation/META-INF/MANIFEST.MF
index c56b22f..e74181a 100644
--- a/plugins/org.eclipse.papyrus.moka.kernel.animation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.papyrus.moka.kernel.animation/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
  org.eclipse.papyrus.moka.kernel;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.1.0,5.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[1.3.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.4.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,4.0.0)",
  org.eclipse.papyrus.infra.ui;bundle-version="[2.1.0,4.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.9.0,2.0.0)",
diff --git a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.target b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.target
index 5ec770c..18c2615 100644
--- a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.target
+++ b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.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="Moka Target Platform" sequenceNumber="1631541882">
+<target name="Moka Target Platform" sequenceNumber="1634806128">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -10,7 +10,7 @@
       <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.json" version="0.0.0"/>
-      <repository id="eclipse" location="http://download.eclipse.org/releases/2021-06"/>
+      <repository id="eclipse" location="http://download.eclipse.org/releases/2021-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"/>
diff --git a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd
index 2c4214c..1a3342b 100644
--- a/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd
+++ b/releng/org.eclipse.papyrus.moka.targetplatform/org.eclipse.papyrus.moka.targetplatform.tpd
@@ -1,6 +1,6 @@
 target "Moka Target Platform" with source requirements
 
-location "http://download.eclipse.org/releases/2021-06" eclipse {
+location "http://download.eclipse.org/releases/2021-09" eclipse {
 	org.eclipse.platform.feature.group lazy
  	org.eclipse.rcp.feature.group lazy
  	org.eclipse.jdt.feature.group lazy