diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 45e499231..a97f21732 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,7 +82,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: com.espressif.idf.update-${{ env.VERSION }}
-        path: releng/com.espressif.idf.update/target/repository
+        path: releng/com.espressif.idf.update/target/composite-repo
 
     - name: Upload Windows x86_64 artifact
       if: ${{ !cancelled() }}
diff --git a/releng/com.espressif.idf.update/pom.xml b/releng/com.espressif.idf.update/pom.xml
index b3565ceb6..3b8d4f99f 100644
--- a/releng/com.espressif.idf.update/pom.xml
+++ b/releng/com.espressif.idf.update/pom.xml
@@ -11,4 +11,63 @@
 		<artifactId>com.espressif.idf.releng</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
+
+	<properties>
+		<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>create-composite-repo</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<property name="eclipse.site" value="https://download.eclipse.org/releases/2025-12/"/>
+								<property name="composite.dir" value="${project.build.directory}/composite-repo"/>
+
+								<mkdir dir="${composite.dir}/artifacts/update"/>
+
+								<copy todir="${composite.dir}/artifacts/update">
+									<fileset dir="${project.build.directory}/repository"/>
+								</copy>
+
+								<echo file="${composite.dir}/compositeContent.xml"><![CDATA[<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='Espressif IDE Update Site' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='${maven.build.timestamp}'/>
+  </properties>
+  <children size='2'>
+    <child location='artifacts/update/'/>
+    <child location='${eclipse.site}'/>
+  </children>
+</repository>
+]]></echo>
+
+								<echo file="${composite.dir}/compositeArtifacts.xml"><![CDATA[<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='Espressif IDE Update Site' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+  <properties size='1'>
+    <property name='p2.timestamp' value='${maven.build.timestamp}'/>
+  </properties>
+  <children size='2'>
+    <child location='artifacts/update/'/>
+    <child location='${eclipse.site}'/>
+  </children>
+</repository>
+]]></echo>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file