From ea96ba83d497f03a25eb71efaf9cc3779eff45ba Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Fri, 24 Nov 2023 12:36:22 +0000
Subject: [PATCH] Fix containers platforms and metadata

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 .github/workflows/.container.template.j2      | 94 ++++++++++++++++---
 .github/workflows/almalinux-containers.yml    | 94 ++++++++++++++++---
 .github/workflows/amazonlinux-containers.yml  | 94 ++++++++++++++++---
 .github/workflows/archlinux-containers.yml    | 94 ++++++++++++++++---
 .github/workflows/busybox-containers.yml      | 94 ++++++++++++++++---
 .github/workflows/centos-containers.yml       | 94 ++++++++++++++++---
 .../workflows/centos-stream-containers.yml    | 94 ++++++++++++++++---
 .github/workflows/consul-containers.yml       | 94 ++++++++++++++++---
 .github/workflows/debian-containers.yml       | 94 ++++++++++++++++---
 .github/workflows/etcd-v2-containers.yml      | 94 ++++++++++++++++---
 .github/workflows/etcd-v3-containers.yml      | 94 ++++++++++++++++---
 .github/workflows/fedora-containers.yml       | 94 ++++++++++++++++---
 .github/workflows/mariadb-containers.yml      | 94 ++++++++++++++++---
 .github/workflows/mysql-server-containers.yml | 94 ++++++++++++++++---
 .../workflows/openldap-minion-containers.yml  | 94 ++++++++++++++++---
 .github/workflows/opensuse-containers.yml     | 94 ++++++++++++++++---
 .github/workflows/packaging-containers.yml    | 94 ++++++++++++++++---
 .github/workflows/percona-containers.yml      | 94 ++++++++++++++++---
 .github/workflows/photon-containers.yml       | 94 ++++++++++++++++---
 .github/workflows/python-containers.yml       | 94 ++++++++++++++++---
 .github/workflows/rabbitmq-containers.yml     | 94 ++++++++++++++++---
 .github/workflows/redis-containers.yml        | 94 ++++++++++++++++---
 .github/workflows/salt-containers.yml         | 94 ++++++++++++++++---
 .../workflows/salt-gitfs-http-containers.yml  | 94 ++++++++++++++++---
 .github/workflows/ssh-minion-containers.yml   | 94 ++++++++++++++++---
 .github/workflows/tinyproxy-containers.yml    | 94 ++++++++++++++++---
 .github/workflows/ubuntu-containers.yml       | 94 ++++++++++++++++---
 .github/workflows/vault-containers.yml        | 94 ++++++++++++++++---
 .github/workflows/virt-minion-containers.yml  | 94 ++++++++++++++++---
 .github/workflows/zookeeper-containers.yml    | 94 ++++++++++++++++---
 tasks/containers.py                           |  6 +-
 31 files changed, 2464 insertions(+), 362 deletions(-)

diff --git a/.github/workflows/.container.template.j2 b/.github/workflows/.container.template.j2
index e5c1b21..b282b2b 100644
--- a/.github/workflows/.container.template.j2
+++ b/.github/workflows/.container.template.j2
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/almalinux-containers.yml b/.github/workflows/almalinux-containers.yml
index 3b5ae16..36a4b43 100644
--- a/.github/workflows/almalinux-containers.yml
+++ b/.github/workflows/almalinux-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/amazonlinux-containers.yml b/.github/workflows/amazonlinux-containers.yml
index b2f37dd..10b113d 100644
--- a/.github/workflows/amazonlinux-containers.yml
+++ b/.github/workflows/amazonlinux-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/archlinux-containers.yml b/.github/workflows/archlinux-containers.yml
index fb929c6..6e91830 100644
--- a/.github/workflows/archlinux-containers.yml
+++ b/.github/workflows/archlinux-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/busybox-containers.yml b/.github/workflows/busybox-containers.yml
index 3e2cdb3..74eea0b 100644
--- a/.github/workflows/busybox-containers.yml
+++ b/.github/workflows/busybox-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/centos-containers.yml b/.github/workflows/centos-containers.yml
index 627b6a4..2b968bd 100644
--- a/.github/workflows/centos-containers.yml
+++ b/.github/workflows/centos-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/centos-stream-containers.yml b/.github/workflows/centos-stream-containers.yml
index e9ede28..9467b07 100644
--- a/.github/workflows/centos-stream-containers.yml
+++ b/.github/workflows/centos-stream-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/consul-containers.yml b/.github/workflows/consul-containers.yml
index 8fbf101..591988d 100644
--- a/.github/workflows/consul-containers.yml
+++ b/.github/workflows/consul-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/debian-containers.yml b/.github/workflows/debian-containers.yml
index 8f0d881..8019bed 100644
--- a/.github/workflows/debian-containers.yml
+++ b/.github/workflows/debian-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/etcd-v2-containers.yml b/.github/workflows/etcd-v2-containers.yml
index a8614b9..54221e4 100644
--- a/.github/workflows/etcd-v2-containers.yml
+++ b/.github/workflows/etcd-v2-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/etcd-v3-containers.yml b/.github/workflows/etcd-v3-containers.yml
index 59ae7dc..0350d99 100644
--- a/.github/workflows/etcd-v3-containers.yml
+++ b/.github/workflows/etcd-v3-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/fedora-containers.yml b/.github/workflows/fedora-containers.yml
index bed55b6..bfb5c7d 100644
--- a/.github/workflows/fedora-containers.yml
+++ b/.github/workflows/fedora-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/mariadb-containers.yml b/.github/workflows/mariadb-containers.yml
index f55d95d..c9bd7a4 100644
--- a/.github/workflows/mariadb-containers.yml
+++ b/.github/workflows/mariadb-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/mysql-server-containers.yml b/.github/workflows/mysql-server-containers.yml
index 1aa8647..6578d06 100644
--- a/.github/workflows/mysql-server-containers.yml
+++ b/.github/workflows/mysql-server-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/openldap-minion-containers.yml b/.github/workflows/openldap-minion-containers.yml
index 915e13f..3286f6b 100644
--- a/.github/workflows/openldap-minion-containers.yml
+++ b/.github/workflows/openldap-minion-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/opensuse-containers.yml b/.github/workflows/opensuse-containers.yml
index 84a08e9..c1a9b27 100644
--- a/.github/workflows/opensuse-containers.yml
+++ b/.github/workflows/opensuse-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/packaging-containers.yml b/.github/workflows/packaging-containers.yml
index 9cf7177..f03a274 100644
--- a/.github/workflows/packaging-containers.yml
+++ b/.github/workflows/packaging-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/percona-containers.yml b/.github/workflows/percona-containers.yml
index 703c2fa..d2ef5e1 100644
--- a/.github/workflows/percona-containers.yml
+++ b/.github/workflows/percona-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/photon-containers.yml b/.github/workflows/photon-containers.yml
index 06703f1..286e4c6 100644
--- a/.github/workflows/photon-containers.yml
+++ b/.github/workflows/photon-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/python-containers.yml b/.github/workflows/python-containers.yml
index 6904d3c..285e22e 100644
--- a/.github/workflows/python-containers.yml
+++ b/.github/workflows/python-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/rabbitmq-containers.yml b/.github/workflows/rabbitmq-containers.yml
index 129f9f5..d12c6cc 100644
--- a/.github/workflows/rabbitmq-containers.yml
+++ b/.github/workflows/rabbitmq-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/redis-containers.yml b/.github/workflows/redis-containers.yml
index 78a1669..e9cc884 100644
--- a/.github/workflows/redis-containers.yml
+++ b/.github/workflows/redis-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/salt-containers.yml b/.github/workflows/salt-containers.yml
index 34fea45..01e07c5 100644
--- a/.github/workflows/salt-containers.yml
+++ b/.github/workflows/salt-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/salt-gitfs-http-containers.yml b/.github/workflows/salt-gitfs-http-containers.yml
index 15589ad..f5a7b73 100644
--- a/.github/workflows/salt-gitfs-http-containers.yml
+++ b/.github/workflows/salt-gitfs-http-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/ssh-minion-containers.yml b/.github/workflows/ssh-minion-containers.yml
index 8ed056e..1df3f4f 100644
--- a/.github/workflows/ssh-minion-containers.yml
+++ b/.github/workflows/ssh-minion-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/tinyproxy-containers.yml b/.github/workflows/tinyproxy-containers.yml
index f159c4f..ec36347 100644
--- a/.github/workflows/tinyproxy-containers.yml
+++ b/.github/workflows/tinyproxy-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/ubuntu-containers.yml b/.github/workflows/ubuntu-containers.yml
index 5ce042c..d08152d 100644
--- a/.github/workflows/ubuntu-containers.yml
+++ b/.github/workflows/ubuntu-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/vault-containers.yml b/.github/workflows/vault-containers.yml
index b46afa8..c183218 100644
--- a/.github/workflows/vault-containers.yml
+++ b/.github/workflows/vault-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/virt-minion-containers.yml b/.github/workflows/virt-minion-containers.yml
index 05fbfb1..f066080 100644
--- a/.github/workflows/virt-minion-containers.yml
+++ b/.github/workflows/virt-minion-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/zookeeper-containers.yml b/.github/workflows/zookeeper-containers.yml
index 9d98d3e..4346e07 100644
--- a/.github/workflows/zookeeper-containers.yml
+++ b/.github/workflows/zookeeper-containers.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   matrix-generator:
-    name: "Mirror Matrix Generator"
+    name: Generate Matrix
     runs-on: ubuntu-latest
     outputs:
       dockerinfo: ${{ steps.set-matrix.outputs.dockerinfo }}
@@ -64,10 +64,10 @@ jobs:
         run: |
           inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
-  mirror-image:
+  build:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    name: "${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -100,14 +100,18 @@ jobs:
         run: |
           t=$(shuf -i 5-30 -n 1); echo "Sleeping $t seconds"; sleep $t
 
-      - name: "Setup DockerFile"
-        run: |
-          echo " " >> ./${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.source=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.url=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.documentation=\"https://github.com/${GITHUB_REPOSITORY}/\"" >> ${{matrix.dockerinfo.file}}
-          echo "LABEL org.opencontainers.image.vendor=\"Unofficial Docker Hub Mirror\"" >> ${{matrix.dockerinfo.file}}
-          cat ./${{matrix.dockerinfo.file}}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
+          tags: |
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
 
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
@@ -133,10 +137,76 @@ jobs:
 
       - name: "Build & Publish"
         uses: docker/build-push-action@v5
+        id: build
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
           platforms: ${{ matrix.dockerinfo.platform }}
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+          outputs: type=image,name=${{ github.repository }}/${{ matrix.dockerinfo.name }},push-by-digest=true,name-canonical=true,push=${{
+            github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    name: "Merge ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
+    strategy:
+      fail-fast: false
+      max-parallel: 10
+      matrix:
+        dockerinfo: ${{ fromJson(needs.matrix-generator.outputs.dockerinfo) }}
+    needs:
+      - matrix-generator
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}
+          path: /tmp/digests
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ github.repository }}/${{ matrix.dockerinfo.name }}
           tags: |
-            ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
+            type=raw,value=${{ matrix.dockerinfo.tag }}
+          flavor: |
+            latest=false
+          labels: |
+            org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}/"
+
+      - name: "Log into GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ github.repository }}/${{ matrix.dockerinfo.name }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ github.repository }}/${{ matrix.dockerinfo.name }}:${{ steps.meta.outputs.version }}
diff --git a/tasks/containers.py b/tasks/containers.py
index 9641a9e..df96d0b 100644
--- a/tasks/containers.py
+++ b/tasks/containers.py
@@ -204,7 +204,8 @@ def matrix(ctx, image, from_workflow=False, build_platforms=None):
                 continue
             output.append(
                 {
-                    "name": f"{details['name']}:{fpath.stem}",
+                    "name": details["name"],
+                    "tag": fpath.stem,
                     "platform": platform,
                     "file": str(fpath.relative_to(utils.REPO_ROOT)),
                     "source_container": source_container,
@@ -215,7 +216,8 @@ def matrix(ctx, image, from_workflow=False, build_platforms=None):
             # This is because the buildx inspect did not return anything
             output.append(
                 {
-                    "name": f"{details['name']}:{fpath.stem}",
+                    "name": details["name"],
+                    "tag": fpath.stem,
                     "file": str(fpath.relative_to(utils.REPO_ROOT)),
                     "source_container": source_container,
                     "platform": "",