diff --git a/Jenkinsfile b/Jenkinsfile
index 2bfe1a4e..4b8b16af 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,11 @@
 pipeline {
     agent {
-        label 'slaves'
+        label 'build'
+    }
+
+    tools {
+        jdk 'java11'
+        maven 'maven-3.9'
     }
 
     environment {
@@ -51,7 +56,6 @@ pipeline {
                 script {
                     // overwrite file content with one more goal
                     writeFile file: 'deploy_goal.txt', text: "${env.DEPLOY_GOAL}"
-                    writeFile file: 'master_branch.txt', text: "${env.MASTER_BRANCH}"
                  }
                 echo "We are on master branch (${env.GIT_BRANCH}) ; deploy goal is \"${env.DEPLOY_GOAL}\""
             }
diff --git a/mailextract/assembly.xml b/mailextract/assembly.xml
index 91c63d82..ff6923b4 100644
--- a/mailextract/assembly.xml
+++ b/mailextract/assembly.xml
@@ -14,7 +14,7 @@
             <includes>
                 <include>MailExtract.exe</include>
                 <include>MailExtractCmd.exe</include>
-                <include>jdk-11/**</include>
+                <include>jdk-11.0.29+7-jre/**</include>
             </includes>
         </fileSet>
     </fileSets>
diff --git a/mailextract/pom.xml b/mailextract/pom.xml
index c2f54480..49875adc 100644
--- a/mailextract/pom.xml
+++ b/mailextract/pom.xml
@@ -117,7 +117,7 @@
                 <executions>
                     <!-- download openjdk -->
                     <execution>
-                        <id>download-jdk</id>
+                        <id>download-jre</id>
                         <phase>package</phase>
                         <goals>
                             <goal>run</goal>
@@ -125,27 +125,28 @@
                         <configuration>
                             <target>
                                 <get
-                                        src="https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_windows-x64_bin.zip"
-                                        dest="${project.build.directory}/openjdk-11+28_windows-x64_bin.zip"
-                                        verbose="false"
-                                        ignoreerrors="false"
-                                        usetimestamp="true"/>
+                                    src="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.29+7/OpenJDK11U-jre_x64_windows_hotspot_11.0.29_7.zip"
+                                    dest="${project.build.directory}/jre11.zip"
+                                    verbose="false"
+                                    ignoreerrors="false"
+                                    usetimestamp="true"/>
                             </target>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>unzip-jdk</id>
+                        <id>unzip-jre</id>
                         <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                         <configuration>
                             <target>
                                 <echo message="unzipping file"/>
-                                <unzip src="${project.build.directory}/openjdk-11+28_windows-x64_bin.zip"
-                                       dest="${project.build.directory}/"/>
+                                <unzip
+                                    src="${project.build.directory}/jre11.zip"
+                                    dest="${project.build.directory}/"/>
                             </target>
                         </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
                     </execution>
                 </executions>
             </plugin>
@@ -167,12 +168,12 @@
                             <icon>windows/VitamIcon.ico</icon>
                             <outfile>${project.build.directory}/MailExtract.exe</outfile>
                             <stayAlive>true</stayAlive>
-                            <downloadUrl>http://java.com/download</downloadUrl>
+                            <downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
                             <classPath>
                                 <mainClass>fr.gouv.vitam.tools.mailextract.MailExtractApp</mainClass>
                             </classPath>
                             <jre>
-                                <path>jdk-11</path>
+                                <path>./jdk-11.0.29+7-jre</path>
                                 <minVersion>11</minVersion>
                                 <requires64Bit/>
                                 <requiresJdk/>
@@ -190,6 +191,7 @@
                                 </txtFileVersion>
                                 <fileDescription>${project.name}</fileDescription>
                                 <copyright>Programme Vitam</copyright>
+                                <companyName>Programme Vitam</companyName>
                                 <productVersion>
                                     ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
                                 </productVersion>
@@ -213,7 +215,7 @@
                             <jar>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</jar>
                             <icon>windows/VitamIcon.ico</icon>
                             <outfile>${project.build.directory}/MailExtractCmd.exe</outfile>
-                            <downloadUrl>http://java.com/download</downloadUrl>
+                            <downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
                             <classPath>
                                 <mainClass>fr.gouv.vitam.tools.mailextract.MailExtractApp</mainClass>
                             </classPath>
@@ -236,6 +238,7 @@
                                 </txtFileVersion>
                                 <fileDescription>${project.name}</fileDescription>
                                 <copyright>Programme Vitam</copyright>
+                                <companyName>Programme Vitam</companyName>
                                 <productVersion>
                                     ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
                                 </productVersion>
diff --git a/packaging/assembly.xml b/packaging/assembly.xml
index e50d4c45..a4ad48eb 100644
--- a/packaging/assembly.xml
+++ b/packaging/assembly.xml
@@ -1,43 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>package</id>
     <formats>
-        <format>tar.gz</format>
+        <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
-        <!-- Add all vitam-external rpm -->
+
+        <!-- Resip -->
         <fileSet>
-            <directory>../resip/windows</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <exclude>VitamIcon.ico</exclude>
-                <exclude>resipIHM.png</exclude>
-            </excludes>
+            <directory>../resip/target</directory>
+            <outputDirectory>resip/</outputDirectory>
+            <includes>
+                <include>Resip.exe</include>
+                <include>resip-${project.version}-shaded.jar</include>
+            </includes>
         </fileSet>
         <fileSet>
-            <directory>../doc</directory>
-            <outputDirectory>/doc</outputDirectory>
+            <directory>../resip/windows</directory>
+            <outputDirectory>resip/</outputDirectory>
+            <includes>
+                <include>Resip.bat</include>
+            </includes>
         </fileSet>
-        <!-- Add "native" vitam-product rpm -->
         <fileSet>
             <directory>../resip/src/test/resources/PacketSamples/</directory>
-            <outputDirectory>config/</outputDirectory>
+            <outputDirectory>resip/config/</outputDirectory>
             <includes>
                 <include>**/ExportContext.config</include>
             </includes>
-            <!-- <excludes>
-                <exclude>**/vitam-gatling-*.rpm</exclude>
-            </excludes> -->
-        </fileSet> 
-    </fileSets>
-    <dependencySets>
-        <!-- Add documentation files -->
-        <dependencySet>
-            <outputDirectory>/</outputDirectory>
-            <unpack>false</unpack>
+        </fileSet>
+        <fileSet>
+            <directory>../resip/doc</directory>
+            <outputDirectory>resip/doc</outputDirectory>
+        </fileSet>
+
+        <!-- TestFileGenerator -->
+        <fileSet>
+            <directory>../testsipgenerator/target</directory>
+            <outputDirectory>testsipgenerator/</outputDirectory>
+            <includes>
+                <include>TestFileGenerator.exe</include>
+                <include>testsipgenerator-${project.version}-shaded.jar</include>
+            </includes>
+        </fileSet>
+
+        <!-- MailExtractor -->
+        <fileSet>
+            <directory>../mailextract/target</directory>
+            <outputDirectory>mailextract/</outputDirectory>
             <includes>
-                <include>fr.gouv.vitam.tools:resip:*</include>
+                <include>MailExtract.exe</include>
+                <include>MailExtractCmd.exe</include>
+                <include>mailextract-${project.version}-shaded.jar</include>
             </includes>
-        </dependencySet>
-    </dependencySets>
+        </fileSet>
+
+    </fileSets>
 </assembly>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 9504aa91..218fde40 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -16,7 +16,7 @@
 
 	<build>
 		<plugins>
-			
+
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
@@ -35,16 +35,8 @@
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
 	</build>
 
-	<dependencies>
-		<!-- VITAM dependencies -->
-		<dependency>
-			<groupId>fr.gouv.vitam.tools</groupId>
-			<artifactId>resip</artifactId>
-			<version>${project.version}</version>
-			<classifier>shaded</classifier>
-		</dependency>
-	</dependencies>
 </project>
diff --git a/resip/assembly.xml b/resip/assembly.xml
index fec50cfc..35d6f350 100644
--- a/resip/assembly.xml
+++ b/resip/assembly.xml
@@ -13,7 +13,7 @@
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>Resip.exe</include>
-                <include>jdk-11/**</include>
+                <include>jdk-11.0.29+7-jre/**</include>
             </includes>
         </fileSet>
         <fileSet>
diff --git a/resip/pom.xml b/resip/pom.xml
index 7305769e..e0653eae 100644
--- a/resip/pom.xml
+++ b/resip/pom.xml
@@ -169,7 +169,7 @@
                 <executions>
                     <!-- download openjdk -->
                     <execution>
-                        <id>download-jdk</id>
+                        <id>download-jre</id>
                         <phase>package</phase>
                         <goals>
                             <goal>run</goal>
@@ -177,27 +177,28 @@
                         <configuration>
                             <target>
                                 <get
-                                        src="https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_windows-x64_bin.zip"
-                                        dest="${project.build.directory}/openjdk-11+28_windows-x64_bin.zip"
-                                        verbose="false"
-                                        ignoreerrors="false"
-                                        usetimestamp="true"/>
+                                    src="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.29+7/OpenJDK11U-jre_x64_windows_hotspot_11.0.29_7.zip"
+                                    dest="${project.build.directory}/jre11.zip"
+                                    verbose="false"
+                                    ignoreerrors="false"
+                                    usetimestamp="true"/>
                             </target>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>unzip-jdk</id>
+                        <id>unzip-jre</id>
                         <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                         <configuration>
                             <target>
                                 <echo message="unzipping file"/>
-                                <unzip src="${project.build.directory}/openjdk-11+28_windows-x64_bin.zip"
-                                       dest="${project.build.directory}/"/>
+                                <unzip
+                                    src="${project.build.directory}/jre11.zip"
+                                    dest="${project.build.directory}/"/>
                             </target>
                         </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
                     </execution>
                 </executions>
             </plugin>
@@ -215,16 +216,16 @@
                         </goals>
                         <configuration>
                             <headerType>gui</headerType>
-                            <jar>target/${project.artifactId}-${project.version}-shaded.jar</jar>
+                            <jar>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</jar>
                             <icon>windows/VitamIcon.ico</icon>
-                            <outfile>windows/Resip.exe</outfile>
+                            <outfile>${project.build.directory}/Resip.exe</outfile>
                             <stayAlive>true</stayAlive>
-                            <downloadUrl>http://java.com/download</downloadUrl>
+                            <downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
                             <classPath>
                                 <mainClass>fr.gouv.vitam.tools.resip.app.ResipApp</mainClass>
                             </classPath>
                             <jre>
-                                <path>.\jre</path>
+                                <path>./jdk-11.0.29+7-jre</path>
                                 <minVersion>11</minVersion>
                                 <requires64Bit/>
                                 <opts>
@@ -241,50 +242,7 @@
                                 </txtFileVersion>
                                 <fileDescription>${project.name}</fileDescription>
                                 <copyright>Programme Vitam</copyright>
-                                <productVersion>
-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                </productVersion>
-                                <txtProductVersion>
-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                </txtProductVersion>
-                                <productName>${project.name}</productName>
-                                <internalName>${project.name}</internalName>
-                                <originalFilename>Resip.exe</originalFilename>
-                            </versionInfo>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>l4j-generate-x64</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>launch4j</goal>
-                        </goals>
-                        <configuration>
-                            <headerType>gui</headerType>
-                            <jar>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</jar>
-                            <icon>windows/VitamIcon.ico</icon>
-                            <outfile>${project.build.directory}/Resip.exe</outfile>
-                            <stayAlive>true</stayAlive>
-                            <downloadUrl>http://java.com/download</downloadUrl>
-                            <classPath>
-                                <mainClass>fr.gouv.vitam.tools.resip.app.ResipApp</mainClass>
-                            </classPath>
-                            <!-- Specify the JRE to include -->
-                            <jre>
-                                <path>jdk-11</path>
-                                <minVersion>11</minVersion>
-                                <requires64Bit/>
-                                <requiresJdk/>
-                            </jre>
-                            <versionInfo>
-                                <fileVersion>
-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                </fileVersion>
-                                <txtFileVersion>
-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                </txtFileVersion>
-                                <fileDescription>${project.name}</fileDescription>
-                                <copyright>Programme Vitam</copyright>
+                                <companyName>Programme Vitam</companyName>
                                 <productVersion>
                                     ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
                                 </productVersion>
@@ -322,7 +280,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>tar.gz-with-jdk-11-assembly</id>
+                        <id>zip-with-jdk-11-assembly</id>
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
diff --git a/testsipgenerator/assembly.xml b/testsipgenerator/assembly.xml
index e1b6985c..16eb8a4d 100644
--- a/testsipgenerator/assembly.xml
+++ b/testsipgenerator/assembly.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <formats>
-        <format>tar.gz</format>
+        <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
-        <!-- Add all vitam-external rpm -->
         <fileSet>
-            <directory>windows/</directory>
+            <directory>${project.build.directory}/</directory>
             <outputDirectory></outputDirectory>
-            <!-- <excludes>
-                <exclude>VitamIcon.ico</exclude>
-            </excludes> -->
+            <includes>
+                <include>TestFileGenerator.exe</include>
+            </includes>
         </fileSet>
     </fileSets>
 </assembly>
diff --git a/testsipgenerator/pom.xml b/testsipgenerator/pom.xml
index c8da5e5b..a9abe722 100644
--- a/testsipgenerator/pom.xml
+++ b/testsipgenerator/pom.xml
@@ -119,15 +119,15 @@
                         </goals>
                         <configuration>
                             <headerType>console</headerType>
-                            <jar>target/${project.artifactId}-${project.version}-shaded.jar</jar>
+                            <jar>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</jar>
                             <icon>windows/VitamIcon.ico</icon>
-                            <outfile>windows/TestFileGenerator.exe</outfile>
-                            <downloadUrl>http://java.com/download</downloadUrl>
+                            <outfile>${project.build.directory}/TestFileGenerator.exe</outfile>
+                            <downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
                             <classPath>
                                 <mainClass>fr.gouv.vitam.tools.testsipgenerator.TestSipGeneratorApp</mainClass>
                             </classPath>
                             <jre>
-                                <path>.\jre</path>
+                                <path>./jdk-11.0.29+7-jre</path>
                                 <minVersion>11</minVersion>
                                 <requires64Bit/>
                                 <opts>
@@ -143,6 +143,7 @@
                                 </txtFileVersion>
                                 <fileDescription>${project.name}</fileDescription>
                                 <copyright>Programme Vitam</copyright>
+                                <companyName>Programme Vitam</companyName>
                                 <productVersion>
                                     ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
                                 </productVersion>