diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
index 23a3facc..1106790c 100644
--- a/.github/workflows/branch.yml
+++ b/.github/workflows/branch.yml
@@ -30,17 +30,6 @@ jobs:
       jar-name: tp2intervals
       jar-artifact-name: tp2intervals-jar
 
-  docker-image:
-    needs:
-      - jar
-      - extract_branch_name
-    uses: ./.github/workflows/workflow-docker-image.yml
-    with:
-      jar-name: tp2intervals
-      jar-artifact-name: tp2intervals-jar
-      image-name: tp2intervals
-      image-tag: ${{ needs.extract_branch_name.outputs.branch_name }}
-
   docker-image-new:
     needs:
       - jar
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 497d58a3..52169821 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,18 +14,6 @@ jobs:
       jar-artifact-name: tp2intervals-jar
       dry-run: false
 
-  docker-image:
-    needs:
-      - jar
-    uses: ./.github/workflows/workflow-docker-image.yml
-    secrets: inherit
-    with:
-      jar-name: tp2intervals
-      jar-artifact-name: tp2intervals-jar
-      image-name: tp2intervals
-      image-tag: latest
-      dry-run: false
-
   docker-image-new:
     needs:
       - jar
diff --git a/.github/workflows/workflow-docker-image-new.yml b/.github/workflows/workflow-docker-image-new.yml
index 31703f5d..bf2076ce 100644
--- a/.github/workflows/workflow-docker-image-new.yml
+++ b/.github/workflows/workflow-docker-image-new.yml
@@ -83,6 +83,8 @@ jobs:
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
             type=ref,event=tag
+            type=ref,event=branch
+            type=ref,event=pr
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
diff --git a/.github/workflows/workflow-docker-image.yml b/.github/workflows/workflow-docker-image.yml
deleted file mode 100644
index 886b57c8..00000000
--- a/.github/workflows/workflow-docker-image.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Workflow Docker
-
-on:
-  workflow_call:
-    inputs:
-      jar-name:
-        required: true
-        type: string
-      jar-artifact-name:
-        required: true
-        type: string
-      image-name:
-        required: true
-        type: string
-      image-tag:
-        required: false
-        type: string
-        default: latest
-      dry-run:
-        required: false
-        type: boolean
-        default: true
-
-jobs:
-  docker-image:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/download-artifact@master
-        with:
-          name: ${{ inputs.jar-artifact-name }}
-          path: artifact
-
-      - name: Build image
-        run: docker build . --file Dockerfile --tag ${{ inputs.image-name }} --build-arg JAR_PATH=artifact/${{ inputs.jar-name }}.jar
-
-      - name: Log into registry
-        if: ${{ inputs.dry-run == false }}
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
-
-      - name: Push image
-        if: ${{ inputs.dry-run == false }}
-        run: |
-          IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/${{ inputs.image-name }}
-          # Change all uppercase to lowercase
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-
-          echo IMAGE_ID=$IMAGE_ID
-          docker tag ${{ inputs.image-name }} $IMAGE_ID:${{ inputs.image-tag }}
-          docker push $IMAGE_ID:${{ inputs.image-tag }}
diff --git a/jdktool/jdks.csv b/jdktool/jdks.csv
index f241e2b1..b91d997c 100644
--- a/jdktool/jdks.csv
+++ b/jdktool/jdks.csv
@@ -1,5 +1,5 @@
 variant,version,os,arch,url,checksum
-jre,21,mac,x64,https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jre21.0.2-macosx_x64.zip,ccf83016bf5bd261c4ab61ca8369e1297505afea1d737c6df49081e728ff3631
-jre,21,mac,arm64,https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jre21.0.2-macosx_aarch64.zip,ea777b38eb629971aec8cbe29c98a8f0b4f3637813bfbd1e35031edc28a6d00a
-jre,21,win,x64,https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jre21.0.2-win_x64.zip,0336647612be361db15a61489c3fcc99385cb7edfe8d75f00d92be56e6dd805f
-jre,21,linux,x64,https://cdn.azul.com/zulu/bin/zulu21.32.17-ca-jre21.0.2-linux_x64.zip,a1b0f9b25effe706b5049b6c4c47bfc83871a3c9f82f62e1af8199a7c425501f
+jre,21,mac,x64,https://cdn.azul.com/zulu/bin/zulu21.34.19-ca-jre21.0.3-macosx_x64.zip,607d4f8fbbca4c10f50644ffcd7ee6213d53e7b393ce466cfc96795961e9a204
+jre,21,mac,arm64,https://cdn.azul.com/zulu/bin/zulu21.34.19-ca-jre21.0.3-macosx_aarch64.zip,413d1b38c4a7a20c30d272bb0c1a774c27b01876d0e2f7fe23b238b068a8456f
+jre,21,win,x64,https://cdn.azul.com/zulu/bin/zulu21.34.19-ca-jre21.0.3-win_x64.zip,56c17e0f152055bfc110347b017e1efd2e1fc243e483d2e3fe371910287059f9
+jre,21,linux,x64,https://cdn.azul.com/zulu/bin/zulu21.34.19-ca-jre21.0.3-linux_x64.zip,ca00198d3a33425f5a29a1dd0eaed6d86a41cffdab7d18764523ad24d3a21df8