diff --git a/.github/workflows/dev-push-to-hub.yml b/.github/workflows/bake-push-to-hub.yml
similarity index 64%
rename from .github/workflows/dev-push-to-hub.yml
rename to .github/workflows/bake-push-to-hub.yml
index f92a8bc2c..eb6dd9168 100644
--- a/.github/workflows/dev-push-to-hub.yml
+++ b/.github/workflows/bake-push-to-hub.yml
@@ -5,6 +5,8 @@ on:
   push:
     branches:
       - "dev"
+    tags:
+      - "v*"
 
 jobs:
   Bake-Push-Images:
@@ -13,12 +15,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set branch name
-        id: variables
-        run: |
-          echo "branch_name=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '-')" >> $GITHUB_OUTPUT
-          echo "git_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -29,7 +25,7 @@ jobs:
           password: "${{ secrets.DOCKER_HUB_PASSWORD }}"
 
       - name: Build and push agent images
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v5
         with:
           files: |
             ./docker-bake.hcl
@@ -38,9 +34,10 @@ jobs:
           set: |
             *.cache-from=type=gha
             *.cache-to=type=gha,mode=max
-            *.args.TAG=${{ steps.variables.outputs.branch_name }}
-            *.args.GIT_SHA=${{ steps.variables.outputs.git_sha }}
+        env:
+          TAG: ${{ github.ref_name }}
+          GIT_SHA: ${{ github.sha }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/dev' }}
+  cancel-in-progress: true
diff --git a/.github/workflows/docker-bake-on-pr.yml b/.github/workflows/docker-bake-on-pr.yml
new file mode 100644
index 000000000..2e00f0929
--- /dev/null
+++ b/.github/workflows/docker-bake-on-pr.yml
@@ -0,0 +1,39 @@
+name: Bake images on PR
+run-name: ${{ github.actor }} is baking images
+
+on:
+  pull_request:
+
+jobs:
+  Bake-Images:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: julepai
+          password: "${{ secrets.DOCKER_HUB_PASSWORD }}"
+
+      - name: Bake images
+        uses: docker/bake-action@v5
+        with:
+          files: |
+            ./docker-bake.hcl
+          targets: agents-api
+          push: false
+          set: |
+            *.cache-from=type=gha
+            *.cache-to=type=gha,mode=max
+        env:
+          TAG: pr-run-${{ github.run_number }}-${{ github.run_attempt }}
+          GIT_SHA: ${{ github.sha }}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
diff --git a/.github/workflows/main-push-to-hub.yml b/.github/workflows/latest-push-to-hub.yml
similarity index 76%
rename from .github/workflows/main-push-to-hub.yml
rename to .github/workflows/latest-push-to-hub.yml
index 8b0fffe89..3853a8faa 100644
--- a/.github/workflows/main-push-to-hub.yml
+++ b/.github/workflows/latest-push-to-hub.yml
@@ -13,11 +13,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set git sha
-        id: variables
-        run: |
-          echo "git_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -28,7 +23,7 @@ jobs:
           password: "${{ secrets.DOCKER_HUB_PASSWORD }}"
 
       - name: Build and push agent images
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v5
         with:
           files: |
             ./docker-bake.hcl
@@ -37,8 +32,9 @@ jobs:
           set: |
             *.cache-from=type=gha
             *.cache-to=type=gha,mode=max
-            *.args.TAG=latest
-            *.args.GIT_SHA=${{ steps.variables.outputs.git_sha }}
+        env:
+          TAG: latest
+          GIT_SHA: ${{ github.sha }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}