diff --git a/.github/workflows/.container.template.j2 b/.github/workflows/.container.template.j2
index 3deb05a..1ad196e 100644
--- a/.github/workflows/.container.template.j2
+++ b/.github/workflows/.container.template.j2
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: <{ repository_path }>-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: <{ repository_path }>-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/almalinux-containers.yml b/.github/workflows/almalinux-containers.yml
index 47ebeac..b2138ac 100644
--- a/.github/workflows/almalinux-containers.yml
+++ b/.github/workflows/almalinux-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/almalinux-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/almalinux-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/amazonlinux-containers.yml b/.github/workflows/amazonlinux-containers.yml
index 69d2b40..ecb6097 100644
--- a/.github/workflows/amazonlinux-containers.yml
+++ b/.github/workflows/amazonlinux-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/amazonlinux-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/amazonlinux-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/archlinux-containers.yml b/.github/workflows/archlinux-containers.yml
index f4ad3d8..8840e68 100644
--- a/.github/workflows/archlinux-containers.yml
+++ b/.github/workflows/archlinux-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/archlinux-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/archlinux-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/busybox-containers.yml b/.github/workflows/busybox-containers.yml
index 7beafbd..339126e 100644
--- a/.github/workflows/busybox-containers.yml
+++ b/.github/workflows/busybox-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/busybox-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/busybox-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/centos-containers.yml b/.github/workflows/centos-containers.yml
index 01dcc23..89232b0 100644
--- a/.github/workflows/centos-containers.yml
+++ b/.github/workflows/centos-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/centos-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/centos-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/centos-stream-containers.yml b/.github/workflows/centos-stream-containers.yml
index e462e09..3bf576b 100644
--- a/.github/workflows/centos-stream-containers.yml
+++ b/.github/workflows/centos-stream-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/centos-stream-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/centos-stream-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/consul-containers.yml b/.github/workflows/consul-containers.yml
index 9bb7b4d..57be46d 100644
--- a/.github/workflows/consul-containers.yml
+++ b/.github/workflows/consul-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/consul-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/consul-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/debian-containers.yml b/.github/workflows/debian-containers.yml
index 7717c1a..195ef83 100644
--- a/.github/workflows/debian-containers.yml
+++ b/.github/workflows/debian-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/debian-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/debian-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/etcd-v2-containers.yml b/.github/workflows/etcd-v2-containers.yml
index 2556ed6..fb85c22 100644
--- a/.github/workflows/etcd-v2-containers.yml
+++ b/.github/workflows/etcd-v2-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/etcd-v2-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/etcd-v2-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/etcd-v3-containers.yml b/.github/workflows/etcd-v3-containers.yml
index 8c68ae3..961f910 100644
--- a/.github/workflows/etcd-v3-containers.yml
+++ b/.github/workflows/etcd-v3-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/etcd-v3-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/etcd-v3-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/fedora-containers.yml b/.github/workflows/fedora-containers.yml
index 5036838..a7eed74 100644
--- a/.github/workflows/fedora-containers.yml
+++ b/.github/workflows/fedora-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/fedora-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/fedora-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/mariadb-containers.yml b/.github/workflows/mariadb-containers.yml
index 9ae3aff..b629545 100644
--- a/.github/workflows/mariadb-containers.yml
+++ b/.github/workflows/mariadb-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/mariadb-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/mariadb-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/mysql-server-containers.yml b/.github/workflows/mysql-server-containers.yml
index 06c53bb..2b428a0 100644
--- a/.github/workflows/mysql-server-containers.yml
+++ b/.github/workflows/mysql-server-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/mysql-server-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/mysql-server-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/openldap-minion-containers.yml b/.github/workflows/openldap-minion-containers.yml
index 2756034..7c5a9ce 100644
--- a/.github/workflows/openldap-minion-containers.yml
+++ b/.github/workflows/openldap-minion-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: custom/openldap-minion-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: custom/openldap-minion-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/opensuse-containers.yml b/.github/workflows/opensuse-containers.yml
index 5094f5f..7a63003 100644
--- a/.github/workflows/opensuse-containers.yml
+++ b/.github/workflows/opensuse-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/opensuse-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/opensuse-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/packaging-containers.yml b/.github/workflows/packaging-containers.yml
index 2dfaeb6..c47e9c7 100644
--- a/.github/workflows/packaging-containers.yml
+++ b/.github/workflows/packaging-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: custom/packaging-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: custom/packaging-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/percona-containers.yml b/.github/workflows/percona-containers.yml
index 77036b0..17cbb52 100644
--- a/.github/workflows/percona-containers.yml
+++ b/.github/workflows/percona-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/percona-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/percona-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/photon-containers.yml b/.github/workflows/photon-containers.yml
index 0be4355..1314bdd 100644
--- a/.github/workflows/photon-containers.yml
+++ b/.github/workflows/photon-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/photon-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/photon-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/python-containers.yml b/.github/workflows/python-containers.yml
index 5e7d84a..6eaa250 100644
--- a/.github/workflows/python-containers.yml
+++ b/.github/workflows/python-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/python-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/python-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/rabbitmq-containers.yml b/.github/workflows/rabbitmq-containers.yml
index d294105..adc3cf5 100644
--- a/.github/workflows/rabbitmq-containers.yml
+++ b/.github/workflows/rabbitmq-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/rabbitmq-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/rabbitmq-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/redis-containers.yml b/.github/workflows/redis-containers.yml
index 025edbe..ba80a6c 100644
--- a/.github/workflows/redis-containers.yml
+++ b/.github/workflows/redis-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/redis-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/redis-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/salt-containers.yml b/.github/workflows/salt-containers.yml
index 4ae8f93..8540753 100644
--- a/.github/workflows/salt-containers.yml
+++ b/.github/workflows/salt-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: salt-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: salt-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/salt-gitfs-http-containers.yml b/.github/workflows/salt-gitfs-http-containers.yml
index e79e988..e644aad 100644
--- a/.github/workflows/salt-gitfs-http-containers.yml
+++ b/.github/workflows/salt-gitfs-http-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: custom/salt-gitfs-http-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: custom/salt-gitfs-http-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/ssh-minion-containers.yml b/.github/workflows/ssh-minion-containers.yml
index 5943959..fe4301b 100644
--- a/.github/workflows/ssh-minion-containers.yml
+++ b/.github/workflows/ssh-minion-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: custom/ssh-minion-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: custom/ssh-minion-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/tinyproxy-containers.yml b/.github/workflows/tinyproxy-containers.yml
index af31a0a..62912fb 100644
--- a/.github/workflows/tinyproxy-containers.yml
+++ b/.github/workflows/tinyproxy-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/tinyproxy-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/tinyproxy-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/ubuntu-containers.yml b/.github/workflows/ubuntu-containers.yml
index a600ef5..f763b3c 100644
--- a/.github/workflows/ubuntu-containers.yml
+++ b/.github/workflows/ubuntu-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/ubuntu-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/ubuntu-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/vault-containers.yml b/.github/workflows/vault-containers.yml
index 006c215..fae3390 100644
--- a/.github/workflows/vault-containers.yml
+++ b/.github/workflows/vault-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/vault-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/vault-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/virt-minion-containers.yml b/.github/workflows/virt-minion-containers.yml
index 5a6aea5..7028d40 100644
--- a/.github/workflows/virt-minion-containers.yml
+++ b/.github/workflows/virt-minion-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: custom/virt-minion-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: custom/virt-minion-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
diff --git a/.github/workflows/zookeeper-containers.yml b/.github/workflows/zookeeper-containers.yml
index 87594db..6798e46 100644
--- a/.github/workflows/zookeeper-containers.yml
+++ b/.github/workflows/zookeeper-containers.yml
@@ -22,11 +22,8 @@ env:
 
 
 concurrency:
-  # Concurrency is defined in a way that concurrent builds against branches do
-  # not cancel previous builds.
-  # However, for every new build against the same pull request source branch,
-  # all older builds against that same branch get canceled.
-  group: mirrors/zookeeper-${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.run_id }}
+  # New builds always cancel previous, still running, builds
+  group: mirrors/zookeeper-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -143,7 +140,7 @@ jobs:
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |