diff --git a/features/org.eclipse.papyrus.model2doc.dev.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.dev.feature/feature.xml
index 3f6e098..ea05466 100755
--- a/features/org.eclipse.papyrus.model2doc.dev.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.dev.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.model2doc.dev.feature"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
diff --git a/features/org.eclipse.papyrus.model2doc.dev.feature/pom.xml b/features/org.eclipse.papyrus.model2doc.dev.feature/pom.xml
index ac7b844..a201606 100755
--- a/features/org.eclipse.papyrus.model2doc.dev.feature/pom.xml
+++ b/features/org.eclipse.papyrus.model2doc.dev.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus-model2doc</groupId>
 		<artifactId>org.eclipse.papyrus.model2doc-features</artifactId>
-		<version>0.8.0-SNAPSHOT</version>
+		<version>0.8.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.papyrus.model2doc.dev.feature</artifactId>
diff --git a/features/org.eclipse.papyrus.model2doc.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.feature/feature.xml
index 6733da3..b8b2411 100755
--- a/features/org.eclipse.papyrus.model2doc.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.model2doc.feature"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
diff --git a/features/org.eclipse.papyrus.model2doc.feature/pom.xml b/features/org.eclipse.papyrus.model2doc.feature/pom.xml
index 2031fd0..504280d 100755
--- a/features/org.eclipse.papyrus.model2doc.feature/pom.xml
+++ b/features/org.eclipse.papyrus.model2doc.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus-model2doc</groupId>
 		<artifactId>org.eclipse.papyrus.model2doc-features</artifactId>
-		<version>0.8.0-SNAPSHOT</version>
+		<version>0.8.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.papyrus.model2doc.feature</artifactId>
diff --git a/features/org.eclipse.papyrus.model2doc.gmf.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.gmf.feature/feature.xml
index 5bd99da..7bf29db 100755
--- a/features/org.eclipse.papyrus.model2doc.gmf.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.gmf.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.model2doc.gmf.feature"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
diff --git a/features/org.eclipse.papyrus.model2doc.gmf.feature/pom.xml b/features/org.eclipse.papyrus.model2doc.gmf.feature/pom.xml
index ca489b5..251bdaf 100755
--- a/features/org.eclipse.papyrus.model2doc.gmf.feature/pom.xml
+++ b/features/org.eclipse.papyrus.model2doc.gmf.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus-model2doc</groupId>
 		<artifactId>org.eclipse.papyrus.model2doc-features</artifactId>
-		<version>0.8.0-SNAPSHOT</version>
+		<version>0.8.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.papyrus.model2doc.gmf.feature</artifactId>
diff --git a/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml
index 508f8f1..6d83401 100755
--- a/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.model2doc.integration.feature"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
diff --git a/features/org.eclipse.papyrus.model2doc.integration.feature/pom.xml b/features/org.eclipse.papyrus.model2doc.integration.feature/pom.xml
index 5edbd95..f743a7b 100755
--- a/features/org.eclipse.papyrus.model2doc.integration.feature/pom.xml
+++ b/features/org.eclipse.papyrus.model2doc.integration.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus-model2doc</groupId>
 		<artifactId>org.eclipse.papyrus.model2doc-features</artifactId>
-		<version>0.8.0-SNAPSHOT</version>
+		<version>0.8.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.papyrus.model2doc.integration.feature</artifactId>
diff --git a/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/feature.xml
index 91d0ff5..6e66118 100755
--- a/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
diff --git a/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/pom.xml b/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/pom.xml
index efbeb5c..8fe28aa 100755
--- a/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/pom.xml
+++ b/features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus-model2doc</groupId>
 		<artifactId>org.eclipse.papyrus.model2doc-features</artifactId>
-		<version>0.8.0-SNAPSHOT</version>
+		<version>0.8.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature</artifactId>
diff --git a/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature/feature.xml
index 113ad41..cc375f9 100755
--- a/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
diff --git a/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature/pom.xml b/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature/pom.xml
index 9b0eecf..4a87b88 100755
--- a/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature/pom.xml
+++ b/features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus-model2doc</groupId>
 		<artifactId>org.eclipse.papyrus.model2doc-features</artifactId>
-		<version>0.8.0-SNAPSHOT</version>
+		<version>0.8.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature</artifactId>
diff --git a/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/feature.xml
index 9044f12..8d3bffd 100755
--- a/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.model2doc.tests.bundles.feature"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
diff --git a/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/pom.xml b/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/pom.xml
index 70b1d27..9202783 100755
--- a/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/pom.xml
+++ b/features/org.eclipse.papyrus.model2doc.tests.bundles.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus-model2doc</groupId>
 		<artifactId>org.eclipse.papyrus.model2doc-features</artifactId>
-		<version>0.8.0-SNAPSHOT</version>
+		<version>0.8.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.papyrus.model2doc.tests.bundles.feature</artifactId>
diff --git a/features/org.eclipse.papyrus.model2doc.tests.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.tests.feature/feature.xml
index bb8b444..48ba7c6 100755
--- a/features/org.eclipse.papyrus.model2doc.tests.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.model2doc.tests.feature"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
@@ -110,6 +110,6 @@
          id="org.eclipse.papyrus.model2doc.uml.template2structure.tests"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>		 
+         version="0.0.0"/>
 
 </feature>
diff --git a/features/org.eclipse.papyrus.model2doc.tests.feature/pom.xml b/features/org.eclipse.papyrus.model2doc.tests.feature/pom.xml
index 52e6e06..00f241d 100755
--- a/features/org.eclipse.papyrus.model2doc.tests.feature/pom.xml
+++ b/features/org.eclipse.papyrus.model2doc.tests.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus-model2doc</groupId>
 		<artifactId>org.eclipse.papyrus.model2doc-features</artifactId>
-		<version>0.8.0-SNAPSHOT</version>
+		<version>0.8.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.papyrus.model2doc.tests.feature</artifactId>
diff --git a/features/org.eclipse.papyrus.model2doc.uml.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.uml.feature/feature.xml
index 5b96d76..965fbd1 100755
--- a/features/org.eclipse.papyrus.model2doc.uml.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.uml.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.model2doc.uml.feature"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
diff --git a/features/org.eclipse.papyrus.model2doc.uml.feature/pom.xml b/features/org.eclipse.papyrus.model2doc.uml.feature/pom.xml
index 047f5fc..5d810b3 100755
--- a/features/org.eclipse.papyrus.model2doc.uml.feature/pom.xml
+++ b/features/org.eclipse.papyrus.model2doc.uml.feature/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus-model2doc</groupId>
 		<artifactId>org.eclipse.papyrus.model2doc-features</artifactId>
-		<version>0.8.0-SNAPSHOT</version>
+		<version>0.8.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.papyrus.model2doc.uml.feature</artifactId>
diff --git a/features/pom.xml b/features/pom.xml
index ed9a271..a04d99a 100755
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,6 +11,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.papyrus.model2doc-features</artifactId>
+	<version>0.8.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Papyrus Model to Documentation Feature</name>
diff --git a/releng-model2doc/category/category.xml b/releng-model2doc/category/category.xml
index ba6fa97..93effbe 100755
--- a/releng-model2doc/category/category.xml
+++ b/releng-model2doc/category/category.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature type="features/org.eclipse.papyrus.model2doc.feature_0.8.0.qualifier.jar" url="features/org.eclipse.papyrus.model2doc.feature_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.feature" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.feature_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.feature" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.feature.source_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.feature.source" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.feature.source_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.feature.source" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.gmf.feature_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.gmf.feature" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.gmf.feature_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.gmf.feature" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.gmf.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.gmf.feature.source_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.gmf.feature.source" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.gmf.feature.source_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.gmf.feature.source" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.gmf.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.uml.feature_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.uml.feature" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.uml.feature_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.uml.feature" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.uml.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.uml.feature.source_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.uml.feature.source" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.uml.feature.source_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.uml.feature.source" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.uml.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.integration.feature_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.feature" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.integration.feature_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.feature" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.integration.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.integration.feature.source_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.feature.source" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.integration.feature.source_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.feature.source" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.integration.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature.source_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature.source" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature.source_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.feature.source" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.integration.ieee.sysml16.odt.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.dev.feature_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.dev.feature" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.dev.feature_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.dev.feature" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.dev.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.dev.feature.source_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.dev.feature.source" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.dev.feature.source_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.dev.feature.source" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.dev.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature_0.8.0.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature_0.8.1.qualifier.jar" id="org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.feature" version="0.8.1.qualifier">
       <category name="org.eclipse.papyrus.model2doc.integration.gmf.category"/>
    </feature>
    <category-def name="org.eclipse.papyrus.model2doc.category" label="Papyrus-Model2Doc">
@@ -76,4 +76,5 @@
    </category-def>
    <repository-reference location="https://download.eclipse.org/modeling/mdt/papyrus/components/sysml16/2022-03/" enabled="true" />
    <repository-reference location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202202190902" enabled="true" />
 </site>
diff --git a/releng-model2doc/category/pom.xml b/releng-model2doc/category/pom.xml
index 6137d42..a3b6ccc 100755
--- a/releng-model2doc/category/pom.xml
+++ b/releng-model2doc/category/pom.xml
@@ -45,7 +45,9 @@
 								<!-- SysML Update site -->
 								<site>https://download.eclipse.org/modeling/mdt/papyrus/components/sysml16/2022-03/</site>
 								<!-- GMF Notation update site -->
-								<site>https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/</site>
+								<site>https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913/</site>
+								<!-- GMF Runtime update site -->
+								<site>https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202202190902/</site>
 							</associateSites>
 						</configuration>
 					</execution>