diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 0baae32bc..9cb48c9eb 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -19,11 +19,8 @@
               registry: rodi26.jfrog.io
               username: 'rodolphe.fontaine@orange.fr'
               password: ${{ secrets.JF_ACCESS_TOKEN }}
-          - name: Set up JDK 17
-            uses: actions/setup-java@v3
+          - name: Build and push
+            uses: docker/build-push-action@v6
             with:
-              java-version: '21'
-              distribution: 'temurin'
-              cache: maven
-          - name: Build & publish the project
-            run: mvn compile jib:build -X -DjibSerialize=true
\ No newline at end of file
+              push: true
+              tags: rodi26.jfrog.io/spring-petclinic:latest
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e32768166..41a9544fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <properties>
 
     <!-- Generic properties -->
-    <java.version>17</java.version>
+    <java.version>21</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- Important for reproducible builds. Update using e.g. ./mvnw versions:set -DnewVersion=... -->
@@ -275,7 +275,21 @@
         <groupId>org.cyclonedx</groupId>
         <artifactId>cyclonedx-maven-plugin</artifactId>
       </plugin>
-
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>jib-maven-plugin</artifactId>
+        <version>3.4.3</version>
+        <configuration>
+          <!-- openjdk:11.0.5-jre -->
+          <from>
+            <image>openjdk:11.0.5-jre</image>
+          </from>
+          <to>
+            <image>docker.io/${docker.image.prefix}/${project.artifactId}</image>
+            <credHelper>pass</credHelper>
+          </to>
+        </configuration>
+      </plugin>
     </plugins>
   </build>