diff --git a/.github/workflows/dev-push-to-hub.yml b/.github/workflows/dev-push-to-hub.yml
index 221ba4791..fc74c4cbe 100644
--- a/.github/workflows/dev-push-to-hub.yml
+++ b/.github/workflows/dev-push-to-hub.yml
@@ -32,8 +32,8 @@ jobs:
           set: |
             *.cache-from=type=gha
             *.cache-to=type=gha,mode=max
-            *.args.TAG=dev
-            *.args.GIT_SHA=${{ github.sha }}
+            TAG=dev
+            GIT_SHA=${{ github.sha }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/docker-bake-on-pr.yml b/.github/workflows/docker-bake-on-pr.yml
index 2d0ccda3a..97e615e5a 100644
--- a/.github/workflows/docker-bake-on-pr.yml
+++ b/.github/workflows/docker-bake-on-pr.yml
@@ -30,9 +30,9 @@ jobs:
           set: |
             *.cache-from=type=gha
             *.cache-to=type=gha,mode=max
-            *.args.TAG=pr-${{ github.ref_name }}
-            *.args.GIT_SHA=${{ github.sha }}
+            TAG=pr-${{ github.ref_name }}
+            GIT_SHA=${{ github.sha }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/dev' }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
diff --git a/.github/workflows/main-push-to-hub.yml b/.github/workflows/main-push-to-hub.yml
index 35f30eb7f..3638792d5 100644
--- a/.github/workflows/main-push-to-hub.yml
+++ b/.github/workflows/main-push-to-hub.yml
@@ -32,8 +32,8 @@ jobs:
           set: |
             *.cache-from=type=gha
             *.cache-to=type=gha,mode=max
-            *.args.TAG=latest
-            *.args.GIT_SHA=${{ github.sha }}
+            TAG=latest
+            GIT_SHA=${{ github.sha }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}