diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml
index a4aed26faa0..7f720a3a2be 100644
--- a/cas/cas-server/pom.xml
+++ b/cas/cas-server/pom.xml
@@ -919,6 +919,10 @@
                 <artifactId>jib-maven-plugin</artifactId>
                 <version>${jib-maven-plugin.version}</version>
                 <configuration>
+                    <from>
+                        <image>gcr.io/distroless/java21</image>
+                    </from>
+                    <allowInsecureRegistries>true</allowInsecureRegistries>
                     <to>
                         <image>${env.SERVICE_DOCKER_PUSH_URL}/vitamui/cas-server</image>
                         <tags>${project.version}</tags>
@@ -928,6 +932,7 @@
                             <path>
                                 <from>target/</from>
                                 <into>/app/</into>
+                                <includes>cas-server.war</includes>
                             </path>
                         </paths>
                     </extraDirectories>
@@ -935,6 +940,14 @@
                         <entrypoint>java,-jar,/app/cas-server.war</entrypoint>
                     </container>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/deployment/roles/vitamui/templates/vitamui-container-componentid.service.j2 b/deployment/roles/vitamui/templates/vitamui-container-componentid.service.j2
index c9ce473cfa1..aaf96fef6e6 100644
--- a/deployment/roles/vitamui/templates/vitamui-container-componentid.service.j2
+++ b/deployment/roles/vitamui/templates/vitamui-container-componentid.service.j2
@@ -8,7 +8,7 @@ ExecStartPre=-/usr/bin/docker pull {{ container_repository.registry_url }}/vitam
 ExecStart=/usr/bin/docker run --rm --network host --name {{ vitamui_struct.vitamui_component }} --user {{ getent_passwd[vitamui_defaults.users.vitamui | default('vitamui')].1 }}:{{ getent_passwd[vitamui_defaults.users.vitamui | default('vitamui')].2 }} \
                               -e "JAVA_TOOL_OPTIONS={{ vitamui_struct.jvm_opts.gc | default(jvm_opts.gc) }} -XX:MaxRAMPercentage=75.0 -XX:MinRAMPercentage=50.0 -XX:+ExitOnOutOfMemoryError -Dlogback.configurationFile={{ vitamui_folder_conf }}/logback.xml -Dvitam.config.folder={{ vitamui_folder_conf }} -Dvitam.data.folder={{ vitamui_folder_data }} -Dvitam.tmp.folder={{ vitamui_folder_tmp }} -Dvitam.log.folder={{ vitamui_folder_log }} -Djava.security.properties={{ vitamui_folder_conf }}/java.security -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -XX:HeapDumpPath={{ vitamui_folder_log }}" \
                               -e "SPRING_CONFIG_ADDITIONAL_LOCATION={{ vitamui_folder_conf }}/application.yml" \
-                              -e "SPRING_APPLICATION_NAME={{ vitamui_struct.vitamui_component }}" \
+                              -e "SPRING_APPLICATION_NAME=vitamui-{{ vitamui_struct.vitamui_component }}" \
                               -v "{{ vitamui_folder_conf }}:{{ vitamui_folder_conf }}:rw" \
                               -v "{{ vitamui_folder_log }}:{{ vitamui_folder_log }}:rw" \
                               -v "{{ vitamui_folder_data }}:{{ vitamui_folder_data }}:rw" \