diff --git a/Jenkinsfile b/Jenkinsfile
index 53289f5c..5fb9b6ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,7 +40,8 @@ pipeline {
 					
 					deployer.addonNightlyDropins("${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/*-dropins-*.zip", deploymentDirName)
 					deployer.addonNightlyUpdateSite("${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/repository/*", deploymentDirName)	
-					deployer.addonNightlyUpdateSite("${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/*-updateSite-*.zip", deploymentDirName)					
+					deployer.addonNightlyUpdateSite("${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/*-updateSite-*.zip", deploymentDirName)
+					deployer.addonNightlyUpdateSite("${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/bom.json", deploymentDirName)
 					
 					currentBuild.description = "${deploymentDirName} - <a href=\"https://download.eclipse.org/capella/addons/xhtmldocgen/dropins/nightly/${deploymentDirName}\">drop-in</a> - <a href=\"https://download.eclipse.org/capella/addons/xhtmldocgen/updates/nightly/${deploymentDirName}\">update-site</a>"
 				}
diff --git a/pom.xml b/pom.xml
index 60e8970f..13e28c61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,8 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<tycho-version>2.7.5</tycho-version>
-		<tycho-extras-version>2.7.5</tycho-extras-version>
+		<tycho-version>4.0.9</tycho-version>
+		<tycho-extras-version>4.0.9</tycho-extras-version>
 		<tycho.scmUrl>scm:git:http://git.polarsys.org/c/capella/capella-xhtml-docgen.git</tycho.scmUrl>
 		<antrun-version>1.7</antrun-version>
 		<jacoco-version>0.8.10</jacoco-version>
@@ -223,9 +223,9 @@
 				</dependencies>
 			</plugin>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho-extras-version}</version>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho-version}</version>
 				<configuration>
 					<archive>
 						<addMavenDescriptor>false</addMavenDescriptor>
@@ -237,10 +237,10 @@
 				</configuration>
 				<executions>
 					<execution>
-						<id>source-feature</id>
+						<id>feature-source</id>
 						<phase>${sourcePhase}</phase>
 						<goals>
-							<goal>source-feature</goal>
+							<goal>feature-source</goal>
 						</goals>
 					</execution>
 				</executions>
@@ -284,9 +284,9 @@
 
 				<!-- plugins only called if a descendant need them -->
 				<plugin>
-					<groupId>org.eclipse.tycho.extras</groupId>
-					<artifactId>tycho-eclipserun-plugin</artifactId>
-					<version>${tycho-extras-version}</version>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-eclipse-plugin</artifactId>
+					<version>${tycho-version}</version>
 					<configuration>
 						<repositories>
 							<repository>
@@ -322,7 +322,14 @@
 								<goal>eclipse-run</goal>
 							</goals>
 							<configuration>
-								<appArgLine>-application org.eclipse.equinox.p2.repository.repo2runnable -source file:${project.build.directory}/repository -destination ${project.build.directory}/${packagedAddonName}/eclipse</appArgLine>
+								<applicationArgs>
+									<arg>-application</arg>
+									<arg>org.eclipse.equinox.p2.repository.repo2runnable</arg>
+									<arg>-source</arg>
+									<arg>file:${project.build.directory}/repository</arg>
+									<arg>-destination</arg>
+									<arg>${project.build.directory}/${packagedAddonName}/eclipse</arg>
+								</applicationArgs>
 							</configuration>
 						</execution>
 					</executions>
@@ -379,6 +386,31 @@
 						</execution>
 					</executions>
 				</plugin>
+
+				<plugin>
+					<groupId>org.cyclonedx</groupId>
+					<artifactId>cyclonedx-maven-plugin</artifactId>
+					<version>2.8.1</version>
+					<configuration>
+						<schemaVersion>1.5</schemaVersion>
+					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-sbom</artifactId>
+							<version>${tycho-version}</version>
+						</dependency>
+					</dependencies>
+					<executions>
+						<execution>
+							<id>create-bom</id>
+							<phase>package</phase>
+							<goals>
+								<goal>makeBom</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
diff --git a/releng/org.polarsys.capella.docgen.site/pom.xml b/releng/org.polarsys.capella.docgen.site/pom.xml
index 746603a2..8af9697e 100644
--- a/releng/org.polarsys.capella.docgen.site/pom.xml
+++ b/releng/org.polarsys.capella.docgen.site/pom.xml
@@ -27,8 +27,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-eclipserun-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-eclipse-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<executions>
 					<execution>
@@ -46,6 +46,16 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.cyclonedx</groupId>
+				<artifactId>cyclonedx-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>create-bom</id>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/releng/org.polarsys.capella.docgen.target/pom.xml b/releng/org.polarsys.capella.docgen.target/pom.xml
index dfecc9f7..681fa20f 100644
--- a/releng/org.polarsys.capella.docgen.target/pom.xml
+++ b/releng/org.polarsys.capella.docgen.target/pom.xml
@@ -33,8 +33,8 @@
 	</licenses>
 
 	<properties>
-		<tycho-version>2.7.5</tycho-version>
-		<tycho-extras-version>2.7.5</tycho-extras-version>
+		<tycho-version>4.0.9</tycho-version>
+		<tycho-extras-version>4.0.9</tycho-extras-version>
 		<platform-name>2023-03</platform-name>
 		<targetPlatform.repository>https://download.eclipse.org/cbi/updates/tpd/nightly/latest</targetPlatform.repository>
 		<targetPlatform.name>capella.target-definition.targetplatform</targetPlatform.name>
@@ -44,9 +44,9 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-eclipserun-plugin</artifactId>
-				<version>${tycho-extras-version}</version>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-eclipse-plugin</artifactId>
+				<version>${tycho-version}</version>
 				<configuration>
 					<repositories>
 						<repository>
@@ -78,10 +78,12 @@
 						<id>generate.target</id>
 						<phase>validate</phase>
 						<configuration>
+							<applicationArgs>
+								<arg>-application</arg>
+								<arg>${converterApplication.name}</arg>
+								<arg>tp/${targetPlatform.name}</arg>
+							</applicationArgs>
 							<executionEnvironment>JavaSE-17</executionEnvironment>
-							<applicationsArgs>
-								<args>-application ${converterApplication.name} tp/${targetPlatform.name}</args>
-							</applicationsArgs>
 						</configuration>
 						<goals>
 							<goal>eclipse-run</goal>
diff --git a/releng/org.polarsys.capella.docgen.target/tp/capella.target-definition.targetplatform b/releng/org.polarsys.capella.docgen.target/tp/capella.target-definition.targetplatform
index 343f5115..74dd0240 100644
--- a/releng/org.polarsys.capella.docgen.target/tp/capella.target-definition.targetplatform
+++ b/releng/org.polarsys.capella.docgen.target/tp/capella.target-definition.targetplatform
@@ -19,7 +19,7 @@ location capella-master "https://download.eclipse.org/capella/core/updates/relea
 	org.polarsys.capella.rcp.feature.group lazy
 }
 
-location kitalpha-docgen-master "https://download.eclipse.org/kitalpha/updates/nightly/sdk/master" {
+location kitalpha-sdk-7.0 "https://download.eclipse.org/kitalpha/updates/stable/sdk/7.0.0.20240612" {
 	org.polarsys.kitalpha.doc.gen.business.core.feature.feature.group lazy
 	org.polarsys.kitalpha.doc.gen.business.core.feature.source.feature.group lazy
 }