diff --git a/plugins/org.obeonetwork.m2doc.sirius.ui/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.m2doc.sirius.ui/META-INF/MANIFEST.MF
index ad3e32252..f7afbf014 100644
--- a/plugins/org.obeonetwork.m2doc.sirius.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.obeonetwork.m2doc.sirius.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.common,
  org.eclipse.emf.ecore,
- org.eclipse.sirius;bundle-version="[5.0.0,6.7.0)",
+ org.eclipse.sirius;bundle-version="[5.0.0,7.1.0)",
  org.obeonetwork.m2doc.genconf,
  org.obeonetwork.m2doc,
  org.obeonetwork.m2doc.ide
diff --git a/plugins/org.obeonetwork.m2doc.sirius/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.m2doc.sirius/META-INF/MANIFEST.MF
index 17dccb92c..0f8121c4a 100644
--- a/plugins/org.obeonetwork.m2doc.sirius/META-INF/MANIFEST.MF
+++ b/plugins/org.obeonetwork.m2doc.sirius/META-INF/MANIFEST.MF
@@ -4,16 +4,16 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.obeonetwork.m2doc.sirius;singleton:=true
 Bundle-Version: 3.2.1.qualifier
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.sirius;bundle-version="[5.0.0,6.7.0)",
- org.eclipse.sirius.diagram;bundle-version="[5.0.0,6.7.0)",
+ org.eclipse.sirius;bundle-version="[5.0.0,7.1.0)",
+ org.eclipse.sirius.diagram;bundle-version="[5.0.0,7.1.0)",
  org.eclipse.gmf.runtime.diagram.ui,
  org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.sirius.diagram.ui;bundle-version="[5.0.0,6.7.0)",
- org.eclipse.sirius.ext.base;bundle-version="[5.0.0,6.7.0)",
- org.eclipse.sirius.table;bundle-version="[5.0.0,6.7.0)",
+ org.eclipse.sirius.diagram.ui;bundle-version="[5.0.0,7.1.0)",
+ org.eclipse.sirius.ext.base;bundle-version="[5.0.0,7.1.0)",
+ org.eclipse.sirius.table;bundle-version="[5.0.0,7.1.0)",
  org.obeonetwork.m2doc;bundle-version="[3.0.0,4.0.0)",
  org.obeonetwork.m2doc.genconf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.sirius.common;bundle-version="[5.0.0,6.7.0)",
+ org.eclipse.sirius.common;bundle-version="[5.0.0,7.1.0)",
  org.eclipse.acceleo.query;bundle-version="[5.0.0,8.0.0)",
  org.obeonetwork.m2doc.ide;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.acceleo.annotations;bundle-version="[5.0.0,8.0.0)",
diff --git a/plugins/org.obeonetwork.m2doc.sirius/src/org/obeonetwork/m2doc/sirius/services/SiriusRepresentationUtils.java b/plugins/org.obeonetwork.m2doc.sirius/src/org/obeonetwork/m2doc/sirius/services/SiriusRepresentationUtils.java
index 4f26938cc..648a2ece2 100644
--- a/plugins/org.obeonetwork.m2doc.sirius/src/org/obeonetwork/m2doc/sirius/services/SiriusRepresentationUtils.java
+++ b/plugins/org.obeonetwork.m2doc.sirius/src/org/obeonetwork/m2doc/sirius/services/SiriusRepresentationUtils.java
@@ -11,6 +11,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.business.api.dialect.DialectManager;
 import org.eclipse.sirius.business.api.query.DRepresentationDescriptorQuery;
+import org.eclipse.sirius.business.api.query.EObjectQuery;
 import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.business.internal.metamodel.helper.LayerHelper;
@@ -34,6 +35,10 @@
 @SuppressWarnings("restriction")
 public final class SiriusRepresentationUtils {
 
+    /**
+     * The getAllLayer() method name.
+     */
+    private static final String GET_ALL_LAYERS = "getAllLayers";
     /**
      * "Sirius compatibility failed" message.
      */
@@ -243,15 +248,30 @@ public static List<Layer> getAllLayer(DiagramDescription description) {
         final List<Layer> res = new ArrayList<>();
 
         try {
-            final Method method = DiagramDescription.class.getMethod("getAllLayers");
+            final Method method = DiagramDescription.class.getMethod(GET_ALL_LAYERS);
             res.addAll((List<Layer>) method.invoke(description));
         } catch (NoSuchMethodException | SecurityException e) {
             try {
-                final Method method = LayerHelper.class.getMethod("getAllLayers", DiagramDescription.class);
+                final Method method = LayerHelper.class.getMethod(GET_ALL_LAYERS, DiagramDescription.class);
                 res.addAll((List<Layer>) method.invoke(null, description));
-            } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
-                    | InvocationTargetException e1) {
-                throw new IllegalStateException(SIRIUS_COMPATIBILITY_FAILED, e);
+            } catch (NoSuchMethodException | SecurityException e1) {
+                // For Sirius 7.x.x
+                try {
+                    final Class<?> cls = SiriusRepresentationUtils.class.getClassLoader().loadClass(
+                            "org.eclipse.sirius.diagram.business.api.componentization.DiagramComponentizationManager");
+                    final Object diagramComponentizationManager = cls.getConstructor(new Class<?>[] {}).newInstance();
+                    final Method method = cls.getMethod(GET_ALL_LAYERS, Collection.class, DiagramDescription.class);
+                    final Collection<Viewpoint> selectedViewpoints = new EObjectQuery(description).getSession()
+                            .getSelectedViewpoints(false);
+                    res.addAll((List<Layer>) method.invoke(diagramComponentizationManager, selectedViewpoints,
+                            description));
+                } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
+                        | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
+                        | SecurityException e2) {
+                    throw new IllegalStateException(SIRIUS_COMPATIBILITY_FAILED, e2);
+                }
+            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e1) {
+                throw new IllegalStateException(SIRIUS_COMPATIBILITY_FAILED, e1);
             }
         } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
             throw new IllegalStateException(SIRIUS_COMPATIBILITY_FAILED, e);
diff --git a/pom.xml b/pom.xml
index c49450762..04e771ddf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
     <module>releng/org.obeonetwork.m2doc.targetplatforms/photon</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/oxygen</module>
     <!-- Sirius -->
+    <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.6.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.5.1</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.5.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.4.x</module>
@@ -51,6 +52,7 @@
     <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.0.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-5.1.1</module>
     <!-- Capella -->
+    <module>releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/capella-5.2.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/capella-5.1.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/capella-5.0.0</module>
@@ -872,6 +874,36 @@
     </profile>
 
     <!-- Sirius -->
+    <profile>
+      <id>platform-sirius-6.6.0</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property>
+          <name>platform-version-name</name>
+          <value>sirius-6.6.0</value>
+        </property>
+      </activation>
+      <properties>
+        <eclipse-rcptt-inject-site>https://download.eclipse.org/sirius/updates/releases/6.6.0/2020-06</eclipse-rcptt-inject-site>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.obeonetwork.m2doc</groupId>
+                  <artifactId>m2doc-sirius-6.6.0</artifactId>
+                  <version>3.2.1-SNAPSHOT</version>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>platform-sirius-6.5.1</id>
       <activation>
@@ -1234,6 +1266,36 @@
     </profile>
 
     <!-- Capella -->
+    <profile>
+      <id>platform-capella-6.0.0</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property>
+          <name>platform-version-name</name>
+          <value>capella-6.0.0</value>
+        </property>
+      </activation>
+      <properties>
+        <eclipse-rcptt-inject-site>https://download.eclipse.org/sirius/updates/stable/7.0.0-S20210908-102403/2021-06</eclipse-rcptt-inject-site>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.obeonetwork.m2doc</groupId>
+                  <artifactId>m2doc-capella-6.0.0</artifactId>
+                  <version>3.2.1-SNAPSHOT</version>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>platform-capella-5.2.0</id>
       <activation>
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/capella-5.2.0/m2doc-capella-5.2.0.target b/releng/org.obeonetwork.m2doc.targetplatforms/capella-5.2.0/m2doc-capella-5.2.0.target
index c8ea0d1a3..b3424640b 100644
--- a/releng/org.obeonetwork.m2doc.targetplatforms/capella-5.2.0/m2doc-capella-5.2.0.target
+++ b/releng/org.obeonetwork.m2doc.targetplatforms/capella-5.2.0/m2doc-capella-5.2.0.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="M2Doc Capella 5.2.0 Target Platform" sequenceNumber="1639127623">
+<target name="M2Doc Capella 5.2.0 Target Platform" sequenceNumber="1639383935">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
@@ -61,7 +61,7 @@
       <unit id="org.eclipse.sirius.aql.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.acceleo.query.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.source.feature.group" version="0.0.0"/>
-      <repository id="sirius" location="https://download.eclipse.org/sirius/updates/stable/6.6.0-S20211126-081944/2020-06"/>
+      <repository id="sirius" location="https://download.eclipse.org/sirius/updates/releases/6.6.0/2020-06"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.polarsys.kitalpha.ad.runtime.feature.source.feature.group" version="0.0.0"/>
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/capella-5.2.0/m2doc-capella-5.2.0.tpd b/releng/org.obeonetwork.m2doc.targetplatforms/capella-5.2.0/m2doc-capella-5.2.0.tpd
index a4c7324ba..d07f40bf9 100644
--- a/releng/org.obeonetwork.m2doc.targetplatforms/capella-5.2.0/m2doc-capella-5.2.0.tpd
+++ b/releng/org.obeonetwork.m2doc.targetplatforms/capella-5.2.0/m2doc-capella-5.2.0.tpd
@@ -58,7 +58,7 @@ location eclipse "https://download.eclipse.org/releases/2020-06" {
 	org.eclipse.pde.feature.group lazy
 }
 
-location sirius "https://download.eclipse.org/sirius/updates/stable/6.6.0-S20211126-081944/2020-06" {
+location sirius "https://download.eclipse.org/sirius/updates/releases/6.6.0/2020-06" {
 	org.eclipse.sirius.doc.feature.feature.group lazy
 	org.eclipse.sirius.doc.feature.source.feature.group lazy
 	org.eclipse.sirius.runtime.source.feature.group lazy
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0/m2doc-capella-6.0.0.target b/releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0/m2doc-capella-6.0.0.target
new file mode 100644
index 000000000..a59c5fe84
--- /dev/null
+++ b/releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0/m2doc-capella-6.0.0.target
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="M2Doc Capella 6.0.0 Target Platform" sequenceNumber="1639404312">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.draw2d.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.validation.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.transaction.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.workspace.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gef.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="com.ibm.icu" version="0.0.0"/>
+      <unit id="org.eclipse.viatra.query.sdk.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jgit.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.egit.mylyn.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.egit.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn.commons.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn.monitor.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn.help.ui" version="0.0.0"/>
+      <unit id="org.apache.log4j" version="0.0.0"/>
+      <unit id="org.apache.commons.lang" version="0.0.0"/>
+      <unit id="com.google.guava" version="0.0.0"/>
+      <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.core.runtime" version="0.0.0"/>
+      <unit id="org.eclipse.ui" version="0.0.0"/>
+      <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
+      <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
+      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.mylyn.wikitext" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.asciidoc" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.confluence" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.html" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.markdown" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.mediawiki" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.textile" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.tracwiki" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.twiki" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+      <repository id="eclipse" location="https://download.eclipse.org/releases/2021-06"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.doc.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.aql.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.interpreter.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.acceleo.ui.interpreter.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.aql.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.acceleo.query.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.source.feature.group" version="0.0.0"/>
+      <repository id="sirius" location="https://download.eclipse.org/sirius/updates/stable/7.0.0-S20210908-102403/2021-06"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.batik.bridge.source" version="0.0.0"/>
+      <unit id="org.apache.batik.script.source" version="0.0.0"/>
+      <repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+      <repository id="GMF-Notation-1.13.0" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
+      <repository id="GMF-Runtime-1.14.0" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202107090702/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.polarsys.kitalpha.ad.runtime.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.cadence.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.common.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.emde.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.emde.ui.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.massactions.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.model.common.share.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.model.common.commands.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.model.common.scrutiny.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.model.detachment.contrib.viewpoints.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.model.detachment.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.model.detachment.ui.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.report.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.report.ui.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.resourcereuse.emfscheme.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.resourcereuse.emfscheme.ui.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.resourcereuse.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.resourcereuse.ui.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.richtext.widget.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.richtext.widget.ext.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.transposer.feature.source.feature.group" version="0.0.0"/>
+      <repository id="kitalpha-runtime-core-master" location="https://download.eclipse.org/kitalpha/updates/stable/runtime/6.0.0-S202109200942"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.polarsys.kitalpha.doc.feature.feature.group" version="0.0.0"/>
+      <unit id="org.polarsys.kitalpha.emde.sdk.feature.source.feature.group" version="0.0.0"/>
+      <repository id="kitalpha-sdk-master" location="https://download.eclipse.org/kitalpha/updates/stable/sdk/6.0.0-S202109200942/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.diffmerge.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.diffmerge.sirius.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.diffmerge.gmf.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.diffmerge.sdk.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.diffmerge.egit.feature.source.feature.group" version="0.0.0"/>
+      <repository id="diffmerge-core" location="https://download.eclipse.org/diffmerge/stable/0.14.0-S20210917/emf-diffmerge-site/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.amalgam.explorer.activity.source.feature.group" version="0.0.0"/>
+      <repository id="amalgam" location="https://download.eclipse.org/modeling/amalgam/updates/stable/1.13.0-S20210909/capella/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.egf.sdk.feature.source.feature.group" version="0.0.0"/>
+      <repository id="egf" location="https://download.eclipse.org/egf/updates/1.6.2/2019-06/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="0.0.0"/>
+      <repository id="Nattable" location="https://download.eclipse.org/nattable/releases/2.0.1/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="0.0.0"/>
+      <repository id="nebula" location="https://download.eclipse.org/nebula/releases/2.3.0/"/>
+    </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-shared-license" location="https://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.polarsys.capella.core.feature.feature.group" version="0.0.0"/>
+      <repository id="site_Capella" location="https://download.eclipse.org/capella/core/updates/stable/6.0.0-S20210922-085001/org.polarsys.capella.rcp.site/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
+      <unit id="org.jsoup" version="1.8.3.v20181012-1713"/>
+      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.poi.feature.feature.group" version="0.0.0"/>
+      <repository id="ObeoNetworkBits" location="http://obeo-networkaggregation-releases.s3-website-eu-west-1.amazonaws.com/bits/master/thirdparties"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.net4j.feature.group" version="0.0.0"/>
+      <repository id="CDO" location="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/>
+      <repository id="XText" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0/m2doc-capella-6.0.0.tpd b/releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0/m2doc-capella-6.0.0.tpd
new file mode 100644
index 000000000..521808e9d
--- /dev/null
+++ b/releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0/m2doc-capella-6.0.0.tpd
@@ -0,0 +1,167 @@
+target "M2Doc Capella 6.0.0 Target Platform"
+
+with source requirements
+
+//include "https://download.eclipse.org/capella/core/updates/stable/6.0.0-S20210922-085001/targets/capella.target-definition.targetplatform"
+
+location eclipse "https://download.eclipse.org/releases/2021-06" {
+	org.eclipse.sdk.feature.group lazy
+	org.eclipse.platform.feature.group lazy
+	org.eclipse.draw2d.source.feature.group lazy
+	org.eclipse.emf.sdk.feature.group lazy
+	org.eclipse.emf.validation.source.feature.group lazy
+	org.eclipse.emf.transaction.source.feature.group lazy
+	org.eclipse.emf.workspace.source.feature.group lazy
+	org.eclipse.gef.source.feature.group lazy
+	org.eclipse.equinox.executable.feature.group lazy
+	com.ibm.icu lazy
+	org.eclipse.viatra.query.sdk.feature.source.feature.group lazy
+	org.eclipse.jgit.source.feature.group lazy
+	org.eclipse.egit.mylyn.feature.group lazy
+	org.eclipse.egit.source.feature.group lazy
+	org.eclipse.mylyn_feature.feature.group lazy
+	org.eclipse.mylyn.commons.feature.group lazy
+	org.eclipse.mylyn.context_feature.feature.group lazy
+	org.eclipse.mylyn.monitor.feature.group lazy
+	org.eclipse.mylyn.team_feature.feature.group lazy
+	org.eclipse.mylyn.ide_feature.feature.group lazy
+	org.eclipse.mylyn.help.ui lazy
+	org.apache.log4j lazy
+	org.apache.commons.lang lazy
+	com.google.guava lazy
+
+	
+	// For M2Doc
+	org.eclipse.platform.sdk lazy
+	org.eclipse.equinox.core.feature.feature.group lazy
+	org.eclipse.core.runtime lazy
+	org.eclipse.ui lazy
+	org.eclipse.ui.views.log lazy
+	org.eclipse.epp.mpc.feature.group lazy
+	org.junit [4.0.0,5.0.0)
+	org.eclipse.jdt.feature.group lazy
+
+	// wikitext
+	org.eclipse.mylyn.wikitext [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.asciidoc [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.confluence [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.html [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.markdown [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.mediawiki [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.textile [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.tracwiki [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.twiki [3.0.0,3.1.0)
+
+    // for testing purpose only
+	org.eclipse.uml2.feature.group lazy
+	org.eclipse.pde.feature.group lazy
+}
+
+location sirius "https://download.eclipse.org/sirius/updates/stable/7.0.0-S20210908-102403/2021-06" {
+	org.eclipse.sirius.doc.feature.feature.group lazy
+	org.eclipse.sirius.doc.feature.source.feature.group lazy
+	org.eclipse.sirius.runtime.source.feature.group lazy
+	org.eclipse.sirius.runtime.aql.source.feature.group lazy
+	org.eclipse.sirius.runtime.ide.ui.source.feature.group lazy
+	org.eclipse.sirius.interpreter.feature.source.feature.group lazy
+	org.eclipse.acceleo.ui.interpreter.source.feature.group lazy
+	org.eclipse.sirius.aql.source.feature.group lazy
+	org.eclipse.acceleo.query.source.feature.group lazy
+	org.eclipse.sirius.runtime.ide.ui.acceleo.source.feature.group lazy
+}
+
+location Orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" {
+	org.apache.batik.bridge.source lazy
+	org.apache.batik.script.source lazy
+}
+
+location GMF-Notation-1.13.0 "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913" {
+    org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
+}
+
+location GMF-Runtime-1.14.0 "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202107090702/" {
+    org.eclipse.gmf.runtime.sdk.feature.group lazy
+    org.eclipse.gmf.runtime.thirdparty.feature.group lazy
+}
+
+location kitalpha-runtime-core-master "https://download.eclipse.org/kitalpha/updates/stable/runtime/6.0.0-S202109200942" {	
+	org.polarsys.kitalpha.ad.runtime.feature.source.feature.group lazy
+	org.polarsys.kitalpha.cadence.feature.source.feature.group lazy
+	org.polarsys.kitalpha.common.feature.source.feature.group lazy
+	org.polarsys.kitalpha.emde.feature.source.feature.group lazy
+	org.polarsys.kitalpha.emde.ui.feature.source.feature.group lazy
+	org.polarsys.kitalpha.massactions.feature.source.feature.group lazy
+	org.polarsys.kitalpha.model.common.share.feature.source.feature.group lazy
+	org.polarsys.kitalpha.model.common.commands.feature.source.feature.group lazy
+	org.polarsys.kitalpha.model.common.scrutiny.feature.source.feature.group lazy
+	org.polarsys.kitalpha.model.detachment.contrib.viewpoints.feature.source.feature.group lazy
+	org.polarsys.kitalpha.model.detachment.feature.source.feature.group lazy
+	org.polarsys.kitalpha.model.detachment.ui.feature.source.feature.group lazy
+	org.polarsys.kitalpha.report.feature.source.feature.group lazy
+	org.polarsys.kitalpha.report.ui.feature.source.feature.group lazy
+	org.polarsys.kitalpha.resourcereuse.emfscheme.feature.source.feature.group lazy
+	org.polarsys.kitalpha.resourcereuse.emfscheme.ui.feature.source.feature.group lazy
+	org.polarsys.kitalpha.resourcereuse.feature.source.feature.group lazy
+	org.polarsys.kitalpha.resourcereuse.ui.feature.source.feature.group lazy
+	org.polarsys.kitalpha.richtext.widget.feature.source.feature.group lazy
+	org.polarsys.kitalpha.richtext.widget.ext.feature.source.feature.group lazy
+	org.polarsys.kitalpha.transposer.feature.source.feature.group lazy
+}
+
+location kitalpha-sdk-master "https://download.eclipse.org/kitalpha/updates/stable/sdk/6.0.0-S202109200942/" {
+	org.polarsys.kitalpha.doc.feature.feature.group lazy
+	org.polarsys.kitalpha.emde.sdk.feature.source.feature.group lazy
+}
+
+location diffmerge-core "https://download.eclipse.org/diffmerge/stable/0.14.0-S20210917/emf-diffmerge-site/" {
+	org.eclipse.emf.diffmerge.feature.source.feature.group lazy
+	org.eclipse.emf.diffmerge.sirius.feature.source.feature.group lazy
+	org.eclipse.emf.diffmerge.gmf.feature.source.feature.group lazy
+	org.eclipse.emf.diffmerge.sdk.feature.source.feature.group lazy
+	org.eclipse.emf.diffmerge.egit.feature.source.feature.group lazy
+}
+
+location amalgam "https://download.eclipse.org/modeling/amalgam/updates/stable/1.13.0-S20210909/capella/" {
+	org.eclipse.amalgam.explorer.activity.source.feature.group lazy
+}
+
+location egf "https://download.eclipse.org/egf/updates/1.6.2/2019-06/" {
+	org.eclipse.egf.sdk.feature.source.feature.group lazy
+}
+
+location Nattable "https://download.eclipse.org/nattable/releases/2.0.1/repository/" {
+	org.eclipse.nebula.widgets.nattable.core.feature.feature.group lazy
+	org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group lazy
+}
+
+location nebula "https://download.eclipse.org/nebula/releases/2.3.0/" {
+	org.eclipse.nebula.widgets.richtext.feature.feature.group lazy
+}
+
+location eclipse-shared-license "https://download.eclipse.org/cbi/updates/license" {
+	org.eclipse.license.feature.group lazy
+}
+
+location site_Capella "https://download.eclipse.org/capella/core/updates/stable/6.0.0-S20210922-085001/org.polarsys.capella.rcp.site/" {
+	org.polarsys.capella.core.feature.feature.group lazy
+}
+
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/" {
+	org.kohsuke.args4j [2.0.21,2.1.0)
+	org.jsoup [1.8.3,1.8.4)
+	javax.servlet [3.1.0,3.2.0)
+}
+
+location ObeoNetworkBits "http://obeo-networkaggregation-releases.s3-website-eu-west-1.amazonaws.com/bits/master/thirdparties" {
+	org.apache.poi.feature.feature.group lazy
+}
+
+location CDO "https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7/" {
+	org.eclipse.emf.cdo.sdk.feature.group lazy
+	org.eclipse.net4j.feature.group lazy
+}
+
+location XText "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/" {
+    // for testing purpose only
+	org.eclipse.xtext.sdk.feature.group [2.25.0,2.26.0)
+}
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0/pom.xml b/releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0/pom.xml
new file mode 100644
index 000000000..04b48728a
--- /dev/null
+++ b/releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0/pom.xml
@@ -0,0 +1,18 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+	<groupId>org.obeonetwork.m2doc</groupId>
+	<artifactId>org.obeonetwork.m2doc.parent</artifactId>
+	<version>3.2.1-SNAPSHOT</version>
+    <relativePath>../../..</relativePath>
+  </parent>
+
+  <groupId>org.obeonetwork.m2doc</groupId>
+  <artifactId>m2doc-capella-6.0.0</artifactId>
+  <version>3.2.1-SNAPSHOT</version>
+  <packaging>eclipse-target-definition</packaging>
+
+</project>
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.6.0/m2doc-sirius-6.6.0.target b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.6.0/m2doc-sirius-6.6.0.target
new file mode 100644
index 000000000..cfbb1792f
--- /dev/null
+++ b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.6.0/m2doc-sirius-6.6.0.target
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="M2Doc Sirius 6.6.0 Target Platform" sequenceNumber="1639384213">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
+      <repository id="Eclipse-Shared-License" location="https://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.core.runtime" version="0.0.0"/>
+      <unit id="org.eclipse.ui" version="0.0.0"/>
+      <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
+      <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+      <unit id="org.eclipse.gmf" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui.render" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <unit id="org.antlr.runtime" version="4.7.2.v20200218-0804"/>
+      <unit id="org.eclipse.mylyn.wikitext" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.asciidoc" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.confluence" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.html" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.markdown" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.mediawiki" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.textile" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.tracwiki" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.mylyn.wikitext.twiki" version="3.0.38.20200817211131"/>
+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+      <repository id="Eclipse" location="https://download.eclipse.org/releases/2020-09"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram.ui" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.table" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.table.ui" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.acceleo.query.source.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/sirius/updates/releases/6.6.0/2020-09"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
+      <unit id="org.jsoup" version="1.8.3.v20181012-1713"/>
+      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.poi.feature.feature.group" version="0.0.0"/>
+      <repository id="ObeoNetworkBits" location="http://obeo-networkaggregation-releases.s3-website-eu-west-1.amazonaws.com/bits/master/thirdparties"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.net4j.feature.group" version="0.0.0"/>
+      <repository id="CDO" location="https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.21.0.v20200302-1509"/>
+      <repository id="XText" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.21.0/"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.6.0/m2doc-sirius-6.6.0.tpd b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.6.0/m2doc-sirius-6.6.0.tpd
new file mode 100644
index 000000000..d982d9d98
--- /dev/null
+++ b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.6.0/m2doc-sirius-6.6.0.tpd
@@ -0,0 +1,79 @@
+target "M2Doc Sirius 6.6.0 Target Platform"
+
+with source requirements
+
+location Eclipse-Shared-License "https://download.eclipse.org/cbi/updates/license" {
+	org.eclipse.license.feature.group [2.0.0,3.0.0)
+}
+
+location Eclipse "https://download.eclipse.org/releases/2020-09" {
+	org.eclipse.platform.sdk lazy
+	org.eclipse.equinox.core.feature.feature.group lazy
+	org.eclipse.equinox.executable.feature.group lazy
+	org.eclipse.core.runtime lazy
+	org.eclipse.ui lazy
+	org.eclipse.ui.views.log lazy
+	org.eclipse.epp.mpc.feature.group lazy
+	org.eclipse.emf.sdk.feature.group lazy
+	org.junit [4.0.0,5.0.0)
+	org.eclipse.gmf lazy
+	org.eclipse.gmf.runtime.diagram.ui lazy
+	org.eclipse.gmf.runtime.diagram.ui.render lazy
+	org.eclipse.jdt.feature.group lazy
+
+	// AQL
+	org.antlr.runtime [4.7.2,4.7.3)
+
+	// wikitext
+	org.eclipse.mylyn.wikitext [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.asciidoc [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.confluence [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.html [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.markdown [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.mediawiki [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.textile [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.tracwiki [3.0.0,3.1.0)
+	org.eclipse.mylyn.wikitext.twiki [3.0.0,3.1.0)
+
+    // for testing purpose only
+	org.eclipse.uml2.feature.group lazy
+	org.eclipse.pde.feature.group lazy
+}
+
+location "https://download.eclipse.org/sirius/updates/releases/6.6.0/2020-09" {
+	org.eclipse.sirius.runtime.feature.group lazy
+	org.eclipse.sirius lazy
+	org.eclipse.sirius.diagram lazy
+	org.eclipse.sirius.diagram.ui lazy
+	org.eclipse.sirius.table lazy
+	org.eclipse.sirius.table.ui lazy
+	org.eclipse.sirius.runtime.ide.ui.feature.group lazy
+
+	// AQL
+	org.eclipse.acceleo.query.feature.group lazy
+	org.eclipse.acceleo.query.source.feature.group lazy
+}
+
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/" {
+	org.kohsuke.args4j [2.0.21,2.1.0)
+	org.jsoup [1.8.3,1.8.4)
+	javax.servlet [3.1.0,3.2.0)
+}
+
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/" {
+	com.google.guava [15.0.0,16.0.0)
+}
+
+location ObeoNetworkBits "http://obeo-networkaggregation-releases.s3-website-eu-west-1.amazonaws.com/bits/master/thirdparties" {
+	org.apache.poi.feature.feature.group lazy
+}
+
+location CDO "https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7/" {
+	org.eclipse.emf.cdo.sdk.feature.group lazy
+	org.eclipse.net4j.feature.group lazy
+}
+
+location XText "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.21.0/" {
+    // for testing purpose only
+	org.eclipse.xtext.sdk.feature.group [2.21.0,2.22.0)
+}
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.6.0/pom.xml b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.6.0/pom.xml
new file mode 100644
index 000000000..007e29f55
--- /dev/null
+++ b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.6.0/pom.xml
@@ -0,0 +1,18 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+	<groupId>org.obeonetwork.m2doc</groupId>
+	<artifactId>org.obeonetwork.m2doc.parent</artifactId>
+	<version>3.2.1-SNAPSHOT</version>
+    <relativePath>../../..</relativePath>
+  </parent>
+
+  <groupId>org.obeonetwork.m2doc</groupId>
+  <artifactId>m2doc-sirius-6.6.0</artifactId>
+  <version>3.2.1-SNAPSHOT</version>
+  <packaging>eclipse-target-definition</packaging>
+
+</project>
diff --git a/tests/org.obeonetwork.m2doc.sirius.tests/META-INF/MANIFEST.MF b/tests/org.obeonetwork.m2doc.sirius.tests/META-INF/MANIFEST.MF
index 185eae935..9e55d4462 100644
--- a/tests/org.obeonetwork.m2doc.sirius.tests/META-INF/MANIFEST.MF
+++ b/tests/org.obeonetwork.m2doc.sirius.tests/META-INF/MANIFEST.MF
@@ -11,9 +11,9 @@ Require-Bundle: org.junit,
  org.obeonetwork.m2doc;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime,
  org.obeonetwork.m2doc.genconf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.sirius;bundle-version="[5.0.0,6.7.0)",
- org.eclipse.sirius.table;bundle-version="[5.0.0,6.7.0)",
- org.eclipse.sirius.common;bundle-version="[5.0.0,6.7.0)",
+ org.eclipse.sirius;bundle-version="[5.0.0,7.1.0)",
+ org.eclipse.sirius.table;bundle-version="[5.0.0,7.1.0)",
+ org.eclipse.sirius.common;bundle-version="[5.0.0,7.1.0)",
  org.obeonetwork.m2doc.tests;bundle-version="[3.0.0,4.0.0)",
  org.apache.poi;bundle-version="[4.1.0,4.2.0)",
  org.eclipse.emf.transaction,
diff --git a/tests/org.obeonetwork.m2doc.tests/META-INF/MANIFEST.MF b/tests/org.obeonetwork.m2doc.tests/META-INF/MANIFEST.MF
index 1d3e40df3..9de98bb8f 100644
--- a/tests/org.obeonetwork.m2doc.tests/META-INF/MANIFEST.MF
+++ b/tests/org.obeonetwork.m2doc.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.obeonetwork.m2doc;bundle-version="[3.0.0,4.0.0)",
  org.junit;bundle-version="4.11.0",
  org.obeonetwork.m2doc.sirius;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.sirius.diagram;bundle-version="[5.0.0,6.7.0)",
+ org.eclipse.sirius.diagram;bundle-version="[5.0.0,7.1.0)",
  org.eclipse.core.resources,
  org.obeonetwork.m2doc.genconf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.acceleo.query;bundle-version="[5.0.0,8.0.0)",