diff --git a/doc/Changelog.md b/doc/Changelog.md
index 27ac46a..c15815e 100644
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -1,3 +1,15 @@
+## AsyncAPI Toolkit v0.6.2
+
+Minor release with a few modifications:
+
+* Add support for raw messages (i.e., do not always send messages in a wrapper with "headers" and "payload"
+* Fix declaration of properties whose Schemas are declared as Components
+* Add a null check when generating imports from headers and payloads
+* Minor fixes in the AsyncAPI to JSON transformation (e.g., commas)
+* Add support for inheritance in the UML2AsyncAPI transformation
+* Fix imports when imported by embedded headers and messages
+* Start preparing the templates to support Kafka (but still throwing UnsupportedOperationExceptions)
+
 ## AsyncAPI Toolkit v0.6.1
 
 Minor release with minor fixes:
diff --git a/doc/Installation.md b/doc/Installation.md
index 8f88adc..f33b754 100644
--- a/doc/Installation.md
+++ b/doc/Installation.md
@@ -21,6 +21,7 @@ First, download the [Eclipse installer](https://www.eclipse.org/downloads/packag
 Setup links:
 
 * [AsyncAPI Toolkit (latest)](https://raw.githubusercontent.com/SOM-Research/asyncapi-toolkit/master/releng/setup/io.github.abelgomez.asyncapi.configuration.latest.setup)
+* [AsyncAPI Toolkit (0.6.2)](https://raw.githubusercontent.com/SOM-Research/asyncapi-toolkit/master/releng/setup/io.github.abelgomez.asyncapi.configuration.0.6.2.setup)
 * [AsyncAPI Toolkit (0.6.1)](https://raw.githubusercontent.com/SOM-Research/asyncapi-toolkit/master/releng/setup/io.github.abelgomez.asyncapi.configuration.0.6.1.setup)
 * [AsyncAPI Toolkit (0.6.0)](https://raw.githubusercontent.com/SOM-Research/asyncapi-toolkit/master/releng/setup/io.github.abelgomez.asyncapi.configuration.0.6.0.setup)
 * [AsyncAPI Toolkit (0.5.0)](https://raw.githubusercontent.com/SOM-Research/asyncapi-toolkit/master/releng/setup/io.github.abelgomez.asyncapi.configuration.0.5.0.setup)
diff --git a/features/io.github.abelgomez.asyncapi.feature/feature.xml b/features/io.github.abelgomez.asyncapi.feature/feature.xml
index c419694..f1be13a 100644
--- a/features/io.github.abelgomez.asyncapi.feature/feature.xml
+++ b/features/io.github.abelgomez.asyncapi.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.github.abelgomez.asyncapi.feature"
       label="AsyncAPI Toolkit"
-      version="0.6.1.qualifier"
+      version="0.6.2.qualifier"
       provider-name="SOM Research Lab">
 
    <description url="https://github.com/SOM-Research/asyncapi-toolkit">
@@ -310,7 +310,7 @@ version(s), and exceptions or additional permissions here}.&quot;
          id="io.github.abelgomez.asyncapi"
          download-size="0"
          install-size="0"
-         version="0.6.1.qualifier"
+         version="0.6.2.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/features/io.github.abelgomez.asyncapi.i40.feature/feature.xml b/features/io.github.abelgomez.asyncapi.i40.feature/feature.xml
index d438123..57517f5 100644
--- a/features/io.github.abelgomez.asyncapi.i40.feature/feature.xml
+++ b/features/io.github.abelgomez.asyncapi.i40.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.github.abelgomez.asyncapi.i40.feature"
       label="AsyncAPI Industry 4.0"
-      version="0.6.1.qualifier"
+      version="0.6.2.qualifier"
       provider-name="SOM Research Lab">
 
    <description url="https://github.com/SOM-Research/asyncapi-toolkit">
diff --git a/features/io.github.abelgomez.asyncapi.i40.profile.feature/feature.xml b/features/io.github.abelgomez.asyncapi.i40.profile.feature/feature.xml
index b743553..8e251ea 100644
--- a/features/io.github.abelgomez.asyncapi.i40.profile.feature/feature.xml
+++ b/features/io.github.abelgomez.asyncapi.i40.profile.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.github.abelgomez.asyncapi.i40.profile.feature"
       label="Industry 4.0 Profile"
-      version="0.6.1.qualifier"
+      version="0.6.2.qualifier"
       provider-name="SOM Research Lab">
 
    <description url="https://github.com/SOM-Research/asyncapi-toolkit">
diff --git a/features/io.github.abelgomez.asyncapi.i40.ui.feature/feature.xml b/features/io.github.abelgomez.asyncapi.i40.ui.feature/feature.xml
index 5e86d61..389175b 100644
--- a/features/io.github.abelgomez.asyncapi.i40.ui.feature/feature.xml
+++ b/features/io.github.abelgomez.asyncapi.i40.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.github.abelgomez.asyncapi.i40.ui.feature"
       label="AsyncAPI Industry 4.0 UI"
-      version="0.6.1.qualifier"
+      version="0.6.2.qualifier"
       provider-name="SOM Research Lab">
 
    <description url="https://github.com/SOM-Research/asyncapi-toolkit">
diff --git a/features/io.github.abelgomez.asyncapi.ui.feature/feature.xml b/features/io.github.abelgomez.asyncapi.ui.feature/feature.xml
index 7555a20..52a94ed 100644
--- a/features/io.github.abelgomez.asyncapi.ui.feature/feature.xml
+++ b/features/io.github.abelgomez.asyncapi.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.github.abelgomez.asyncapi.ui.feature"
       label="AsyncAPI Toolkit UI"
-      version="0.6.1.qualifier"
+      version="0.6.2.qualifier"
       provider-name="SOM Research Lab">
 
    <description url="https://github.com/SOM-Research/asyncapi-toolkit">
@@ -321,14 +321,14 @@ version(s), and exceptions or additional permissions here}.&quot;
          id="io.github.abelgomez.asyncapi.ide"
          download-size="0"
          install-size="0"
-         version="0.6.1.qualifier"
+         version="0.6.2.qualifier"
          unpack="false"/>
 
    <plugin
          id="io.github.abelgomez.asyncapi.ui"
          download-size="0"
          install-size="0"
-         version="0.6.1.qualifier"
+         version="0.6.2.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/features/pom.xml b/features/pom.xml
index 9abaf5c..0503932 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>io.github.abelgomez.asyncapi</groupId>
 		<artifactId>root</artifactId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>0.6.2-SNAPSHOT</version>
 	</parent>
 	<groupId>io.github.abelgomez.asyncapi</groupId>
 	<artifactId>features</artifactId>
diff --git a/plugins/io.github.abelgomez.asyncapi.i40.profile/META-INF/MANIFEST.MF b/plugins/io.github.abelgomez.asyncapi.i40.profile/META-INF/MANIFEST.MF
index a6dd6c7..8bb169c 100644
--- a/plugins/io.github.abelgomez.asyncapi.i40.profile/META-INF/MANIFEST.MF
+++ b/plugins/io.github.abelgomez.asyncapi.i40.profile/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.github.abelgomez.asyncapi.i40.profile;singleton:=true
 Automatic-Module-Name: io.github.abelgomez.asyncapi.i40.profile
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/io.github.abelgomez.asyncapi.i40.ui/META-INF/MANIFEST.MF b/plugins/io.github.abelgomez.asyncapi.i40.ui/META-INF/MANIFEST.MF
index c6acbe2..2813be3 100644
--- a/plugins/io.github.abelgomez.asyncapi.i40.ui/META-INF/MANIFEST.MF
+++ b/plugins/io.github.abelgomez.asyncapi.i40.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AsyncAPI Industry 4.0 UI Plug-in
 Bundle-SymbolicName: io.github.abelgomez.asyncapi.i40.ui;singleton:=true
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.qualifier
 Bundle-Activator: io.github.abelgomez.asyncapi.i40.ui.I40UiPlugin
 Bundle-Vendor: SOM Research Lab
 Require-Bundle: io.github.abelgomez.asyncapi,
diff --git a/plugins/io.github.abelgomez.asyncapi.i40.ui/pom.xml b/plugins/io.github.abelgomez.asyncapi.i40.ui/pom.xml
index e6ae384..60312a5 100644
--- a/plugins/io.github.abelgomez.asyncapi.i40.ui/pom.xml
+++ b/plugins/io.github.abelgomez.asyncapi.i40.ui/pom.xml
@@ -7,10 +7,10 @@
 	<parent>
 		<groupId>io.github.abelgomez.asyncapi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>0.6.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>io.github.abelgomez.asyncapi.i40.ui</artifactId>
-	<version>0.6.1-SNAPSHOT</version>
+	<version>0.6.2-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>[bundle] AsyncAPI Industry 4.0 UI Plug-in</name>
 	<organization>
diff --git a/plugins/io.github.abelgomez.asyncapi.i40/META-INF/MANIFEST.MF b/plugins/io.github.abelgomez.asyncapi.i40/META-INF/MANIFEST.MF
index ec036e2..44bbf9d 100644
--- a/plugins/io.github.abelgomez.asyncapi.i40/META-INF/MANIFEST.MF
+++ b/plugins/io.github.abelgomez.asyncapi.i40/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AsyncAPI Industry 4.0 Plug-in
 Bundle-SymbolicName: io.github.abelgomez.asyncapi.i40
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.qualifier
 Bundle-Activator: io.github.abelgomez.asyncapi.i40.I40Plugin
 Bundle-Vendor: SOM Research Lab
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/io.github.abelgomez.asyncapi.i40/pom.xml b/plugins/io.github.abelgomez.asyncapi.i40/pom.xml
index ad95557..8eeea83 100644
--- a/plugins/io.github.abelgomez.asyncapi.i40/pom.xml
+++ b/plugins/io.github.abelgomez.asyncapi.i40/pom.xml
@@ -7,10 +7,10 @@
 	<parent>
 		<groupId>io.github.abelgomez.asyncapi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>0.6.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>io.github.abelgomez.asyncapi.i40</artifactId>
-	<version>0.6.1-SNAPSHOT</version>
+	<version>0.6.2-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>[bundle] AsyncAPI Industry 4.0 Plug-in</name>
 	<organization>
diff --git a/plugins/io.github.abelgomez.asyncapi.ide/META-INF/MANIFEST.MF b/plugins/io.github.abelgomez.asyncapi.ide/META-INF/MANIFEST.MF
index a7ff4b9..20d24c3 100644
--- a/plugins/io.github.abelgomez.asyncapi.ide/META-INF/MANIFEST.MF
+++ b/plugins/io.github.abelgomez.asyncapi.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: io.github.abelgomez.asyncapi.ide
 Bundle-ManifestVersion: 2
 Bundle-Name: AsyncAPI Toolkit IDE Support Plug-in
 Bundle-Vendor: SOM Research Lab
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.qualifier
 Bundle-SymbolicName: io.github.abelgomez.asyncapi.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: io.github.abelgomez.asyncapi,
diff --git a/plugins/io.github.abelgomez.asyncapi.ide/pom.xml b/plugins/io.github.abelgomez.asyncapi.ide/pom.xml
index a47d5be..bc78d58 100644
--- a/plugins/io.github.abelgomez.asyncapi.ide/pom.xml
+++ b/plugins/io.github.abelgomez.asyncapi.ide/pom.xml
@@ -7,10 +7,10 @@
 	<parent>
 		<groupId>io.github.abelgomez.asyncapi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>0.6.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>io.github.abelgomez.asyncapi.ide</artifactId>
-	<version>0.6.1-SNAPSHOT</version>
+	<version>0.6.2-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>[bundle] AsyncAPI Toolkit IDE Support Plug-in</name>
 	<organization>
diff --git a/plugins/io.github.abelgomez.asyncapi.ui/META-INF/MANIFEST.MF b/plugins/io.github.abelgomez.asyncapi.ui/META-INF/MANIFEST.MF
index 5d19978..882fe75 100644
--- a/plugins/io.github.abelgomez.asyncapi.ui/META-INF/MANIFEST.MF
+++ b/plugins/io.github.abelgomez.asyncapi.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: io.github.abelgomez.asyncapi.ui
 Bundle-ManifestVersion: 2
 Bundle-Name: AsyncAPI Toolkit UI Plug-in
 Bundle-Vendor: SOM Research Lab
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.qualifier
 Bundle-SymbolicName: io.github.abelgomez.asyncapi.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: io.github.abelgomez.asyncapi,
diff --git a/plugins/io.github.abelgomez.asyncapi.ui/pom.xml b/plugins/io.github.abelgomez.asyncapi.ui/pom.xml
index 04034e6..28ebed9 100644
--- a/plugins/io.github.abelgomez.asyncapi.ui/pom.xml
+++ b/plugins/io.github.abelgomez.asyncapi.ui/pom.xml
@@ -7,10 +7,10 @@
 	<parent>
 		<groupId>io.github.abelgomez.asyncapi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>0.6.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>io.github.abelgomez.asyncapi.ui</artifactId>
-	<version>0.6.1-SNAPSHOT</version>
+	<version>0.6.2-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>[bundle] AsyncAPI Toolkit UI Plug-in</name>
 	<organization>
diff --git a/plugins/io.github.abelgomez.asyncapi/META-INF/MANIFEST.MF b/plugins/io.github.abelgomez.asyncapi/META-INF/MANIFEST.MF
index c3359ed..4c5480e 100644
--- a/plugins/io.github.abelgomez.asyncapi/META-INF/MANIFEST.MF
+++ b/plugins/io.github.abelgomez.asyncapi/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: io.github.abelgomez.asyncapi
 Bundle-ManifestVersion: 2
 Bundle-Name: AsyncAPI Toolkit Plug-in
 Bundle-Vendor: SOM Research Lab
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.qualifier
 Bundle-SymbolicName: io.github.abelgomez.asyncapi; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,
diff --git a/plugins/io.github.abelgomez.asyncapi/model/AsyncApi.aird b/plugins/io.github.abelgomez.asyncapi/model/AsyncApi.aird
index 97beca7..242b0c3 100644
--- a/plugins/io.github.abelgomez.asyncapi/model/AsyncApi.aird
+++ b/plugins/io.github.abelgomez.asyncapi/model/AsyncApi.aird
@@ -3,8 +3,6 @@
   <viewpoint:DAnalysis uid="_tgdeMFbgEemDn96f0DJa7Q" selectedViews="_t6KXoFbgEemDn96f0DJa7Q _t6OCAFbgEemDn96f0DJa7Q _t6XzAFbgEemDn96f0DJa7Q _t6XzAVbgEemDn96f0DJa7Q" version="15.0.0.202201261500">
     <semanticResources>http://www.eclipse.org/emf/2002/Ecore</semanticResources>
     <semanticResources>AsyncApi.genmodel</semanticResources>
-    <semanticResources>generated/AsyncApi.genmodel</semanticResources>
-    <semanticResources>generated/AsyncApi.ecore</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_t6KXoFbgEemDn96f0DJa7Q">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
       <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_NX2SMFyiEem4NbPa7826aw" name="AsyncApi" repPath="#_NXiwMFyiEem4NbPa7826aw" changeId="ba84417f-437b-4aaa-8817-2a8ecfab6836">
diff --git a/plugins/io.github.abelgomez.asyncapi/pom.xml b/plugins/io.github.abelgomez.asyncapi/pom.xml
index 6477c91..1051cb0 100644
--- a/plugins/io.github.abelgomez.asyncapi/pom.xml
+++ b/plugins/io.github.abelgomez.asyncapi/pom.xml
@@ -7,10 +7,10 @@
 	<parent>
 		<groupId>io.github.abelgomez.asyncapi</groupId>
 		<artifactId>plugins</artifactId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>0.6.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>io.github.abelgomez.asyncapi</artifactId>
-	<version>0.6.1-SNAPSHOT</version>
+	<version>0.6.2-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>[bundle] AsyncAPI Toolkit Plug-in</name>
 	<organization>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 3ffa20b..cc8b798 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.github.abelgomez.asyncapi</groupId>
 		<artifactId>root</artifactId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>0.6.2-SNAPSHOT</version>
 	</parent>
 	<groupId>io.github.abelgomez.asyncapi</groupId>
 	<artifactId>plugins</artifactId>
diff --git a/pom.xml b/pom.xml
index f16e86f..fc726d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 	<groupId>io.github.abelgomez.asyncapi</groupId>
 	<artifactId>root</artifactId>
 	<name>[container] AsyncAPI Toolkit</name>
-	<version>0.6.1-SNAPSHOT</version>
+	<version>0.6.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>plugins</module>
@@ -101,7 +101,7 @@
 						<artifact>
 							<groupId>io.github.abelgomez.asyncapi</groupId>
 							<artifactId>platform</artifactId>
-							<version>0.6.1-SNAPSHOT</version>
+							<version>0.6.2-SNAPSHOT</version>
 						</artifact>
 					</target>
 					<environments>
diff --git a/releng/pom.xml b/releng/pom.xml
index 30ad68d..995e7f0 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>io.github.abelgomez.asyncapi</groupId>
 		<artifactId>root</artifactId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>0.6.2-SNAPSHOT</version>
 	</parent>
 	<groupId>io.github.abelgomez.asyncapi</groupId>
 	<artifactId>releng</artifactId>
diff --git a/releng/products/asyncapi.product b/releng/products/asyncapi.product
index bffe3eb..1ed6655 100644
--- a/releng/products/asyncapi.product
+++ b/releng/products/asyncapi.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="AsyncAPI Toolkit" uid="io.github.abelgomez.asyncapi.product" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="0.6.1.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="AsyncAPI Toolkit" uid="io.github.abelgomez.asyncapi.product" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="0.6.2.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="eclipse_lg.png"/>
diff --git a/releng/products/pom.xml b/releng/products/pom.xml
index 9516900..afa9090 100644
--- a/releng/products/pom.xml
+++ b/releng/products/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>io.github.abelgomez.asyncapi</groupId>
 		<artifactId>releng</artifactId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>0.6.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>products</artifactId>
 	<packaging>eclipse-repository</packaging>
diff --git a/releng/setup/io.github.abelgomez.asyncapi.catalog.setup b/releng/setup/io.github.abelgomez.asyncapi.catalog.setup
index 66f8d4e..3125964 100644
--- a/releng/setup/io.github.abelgomez.asyncapi.catalog.setup
+++ b/releng/setup/io.github.abelgomez.asyncapi.catalog.setup
@@ -210,6 +210,52 @@
             url="https://som-research.github.io/asyncapi-toolkit/updates/0.6.1"/>
       </setupTask>
     </version>
+    <version
+        name="0.6.2"
+        label="0.6.2"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://github.com/SOM-Research/asyncapi-toolkit/</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>AsyncAPI Toolkit</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse - 2022-03">
+        <repository
+            url="http://download.eclipse.org/releases/2022-03/"/>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse Project Updates - 4.23">
+        <requirement
+            name="org.eclipse.platform.ide"/>
+        <repository
+            url="http://download.eclipse.org/eclipse/updates/4.23/"/>
+      </setupTask>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="AsyncAPI Toolkit - 0.6.1">
+        <requirement
+            name="io.github.abelgomez.asyncapi.i40.feature.feature.group"/>
+        <requirement
+            name="io.github.abelgomez.asyncapi.i40.ui.feature.feature.group"/>
+        <requirement
+            name="io.github.abelgomez.asyncapi.feature.feature.group"/>
+        <requirement
+            name="io.github.abelgomez.asyncapi.ui.feature.feature.group"/>
+        <requirement
+            name="io.github.abelgomez.asyncapi.i40.profile.feature.feature.group"/>
+        <repository
+            url="https://som-research.github.io/asyncapi-toolkit/updates/0.6.1"/>
+      </setupTask>
+    </version>
     <description>Package suited to design AsyncAPI-based event-driven architectures based on the Eclipse Platform adding the AsyncAPI Toolkit, m2e, JDT, among other utilities.</description>
   </product>
   <description>The catalog of products available as packaged downloads for the AsyncAPI Toolkit.</description>
diff --git a/releng/setup/io.github.abelgomez.asyncapi.configuration.0.6.2.setup b/releng/setup/io.github.abelgomez.asyncapi.configuration.0.6.2.setup
new file mode 100644
index 0000000..46fbf95
--- /dev/null
+++ b/releng/setup/io.github.abelgomez.asyncapi.configuration.0.6.2.setup
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<setup:Configuration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
+    label="AsyncAPI Toolkit Installation Configuration">
+  <installation
+      name="io.github.abelgomez.asyncapi.installation"
+      label="AsyncAPI Toolkit Installation">
+    <productVersion
+        href="io.github.abelgomez.asyncapi.catalog.setup#//@products[name='asyncapi-toolkit']/@versions[name='0.6.2']"/>
+    <description>AsyncAPI Toolkit Installation.</description>
+  </installation>
+  <description>The AsyncAPI Toolkit Configuration allows installing the AsyncAPI Toolkit.</description>
+</setup:Configuration>
diff --git a/releng/update/pom.xml b/releng/update/pom.xml
index 1254823..90a63e4 100644
--- a/releng/update/pom.xml
+++ b/releng/update/pom.xml
@@ -7,10 +7,10 @@
 	<parent>
 		<groupId>io.github.abelgomez.asyncapi</groupId>
 		<artifactId>releng</artifactId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>0.6.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>update.eclipse-repository</artifactId>
-	<version>0.6.1-SNAPSHOT</version>
+	<version>0.6.2-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<name>[updatesite] AsyncAPI Toolkit Update Site</name>
 	<build>