diff --git a/.github/workflows/.container.template.j2 b/.github/workflows/.container.template.j2
index b67fdac..b7552c2 100644
--- a/.github/workflows/.container.template.j2
+++ b/.github/workflows/.container.template.j2
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/almalinux-containers.yml b/.github/workflows/almalinux-containers.yml
index dffad1f..8e5b939 100644
--- a/.github/workflows/almalinux-containers.yml
+++ b/.github/workflows/almalinux-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/amazonlinux-containers.yml b/.github/workflows/amazonlinux-containers.yml
index c85d505..2683d3a 100644
--- a/.github/workflows/amazonlinux-containers.yml
+++ b/.github/workflows/amazonlinux-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/archlinux-containers.yml b/.github/workflows/archlinux-containers.yml
index e446ae8..23630d7 100644
--- a/.github/workflows/archlinux-containers.yml
+++ b/.github/workflows/archlinux-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/busybox-containers.yml b/.github/workflows/busybox-containers.yml
index 4979bc5..76943d2 100644
--- a/.github/workflows/busybox-containers.yml
+++ b/.github/workflows/busybox-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/centos-containers.yml b/.github/workflows/centos-containers.yml
index 0ff1107..7c81f90 100644
--- a/.github/workflows/centos-containers.yml
+++ b/.github/workflows/centos-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/centos-stream-containers.yml b/.github/workflows/centos-stream-containers.yml
index 7a0a1cc..7433ada 100644
--- a/.github/workflows/centos-stream-containers.yml
+++ b/.github/workflows/centos-stream-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/consul-containers.yml b/.github/workflows/consul-containers.yml
index 58c3a69..c0ff42a 100644
--- a/.github/workflows/consul-containers.yml
+++ b/.github/workflows/consul-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/debian-containers.yml b/.github/workflows/debian-containers.yml
index b1635a6..2af01fa 100644
--- a/.github/workflows/debian-containers.yml
+++ b/.github/workflows/debian-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/etcd-v2-containers.yml b/.github/workflows/etcd-v2-containers.yml
index 924e272..4ed6034 100644
--- a/.github/workflows/etcd-v2-containers.yml
+++ b/.github/workflows/etcd-v2-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/etcd-v3-containers.yml b/.github/workflows/etcd-v3-containers.yml
index ec66cc2..6d21ae1 100644
--- a/.github/workflows/etcd-v3-containers.yml
+++ b/.github/workflows/etcd-v3-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/fedora-containers.yml b/.github/workflows/fedora-containers.yml
index 563ea3b..e2b60bc 100644
--- a/.github/workflows/fedora-containers.yml
+++ b/.github/workflows/fedora-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/mariadb-containers.yml b/.github/workflows/mariadb-containers.yml
index 677714d..6bd0ac3 100644
--- a/.github/workflows/mariadb-containers.yml
+++ b/.github/workflows/mariadb-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/mysql-server-containers.yml b/.github/workflows/mysql-server-containers.yml
index 3fa9c1e..9d4f8cd 100644
--- a/.github/workflows/mysql-server-containers.yml
+++ b/.github/workflows/mysql-server-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/openldap-minion-containers.yml b/.github/workflows/openldap-minion-containers.yml
index f75dc0d..6247bf7 100644
--- a/.github/workflows/openldap-minion-containers.yml
+++ b/.github/workflows/openldap-minion-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/opensuse-containers.yml b/.github/workflows/opensuse-containers.yml
index 05e64dc..58a3fa8 100644
--- a/.github/workflows/opensuse-containers.yml
+++ b/.github/workflows/opensuse-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/packaging-containers.yml b/.github/workflows/packaging-containers.yml
index f396d26..6f6b3f0 100644
--- a/.github/workflows/packaging-containers.yml
+++ b/.github/workflows/packaging-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/percona-containers.yml b/.github/workflows/percona-containers.yml
index 289456e..6e6fbe7 100644
--- a/.github/workflows/percona-containers.yml
+++ b/.github/workflows/percona-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/photon-containers.yml b/.github/workflows/photon-containers.yml
index 6896f5b..5500b42 100644
--- a/.github/workflows/photon-containers.yml
+++ b/.github/workflows/photon-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/python-containers.yml b/.github/workflows/python-containers.yml
index 1f5e6ef..02d9360 100644
--- a/.github/workflows/python-containers.yml
+++ b/.github/workflows/python-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/rabbitmq-containers.yml b/.github/workflows/rabbitmq-containers.yml
index 1f37d4f..d1e0a7c 100644
--- a/.github/workflows/rabbitmq-containers.yml
+++ b/.github/workflows/rabbitmq-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/redis-containers.yml b/.github/workflows/redis-containers.yml
index 401da98..4b66e55 100644
--- a/.github/workflows/redis-containers.yml
+++ b/.github/workflows/redis-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/salt-containers.yml b/.github/workflows/salt-containers.yml
index 1cfa10f..65aa971 100644
--- a/.github/workflows/salt-containers.yml
+++ b/.github/workflows/salt-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/salt-gitfs-http-containers.yml b/.github/workflows/salt-gitfs-http-containers.yml
index 5ea345e..7d82099 100644
--- a/.github/workflows/salt-gitfs-http-containers.yml
+++ b/.github/workflows/salt-gitfs-http-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/ssh-minion-containers.yml b/.github/workflows/ssh-minion-containers.yml
index 2ea0de7..a689c68 100644
--- a/.github/workflows/ssh-minion-containers.yml
+++ b/.github/workflows/ssh-minion-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/tinyproxy-containers.yml b/.github/workflows/tinyproxy-containers.yml
index 01c1484..f466b94 100644
--- a/.github/workflows/tinyproxy-containers.yml
+++ b/.github/workflows/tinyproxy-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/ubuntu-containers.yml b/.github/workflows/ubuntu-containers.yml
index cfe3637..3c4bdd1 100644
--- a/.github/workflows/ubuntu-containers.yml
+++ b/.github/workflows/ubuntu-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/vault-containers.yml b/.github/workflows/vault-containers.yml
index de9a018..c350f9e 100644
--- a/.github/workflows/vault-containers.yml
+++ b/.github/workflows/vault-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/virt-minion-containers.yml b/.github/workflows/virt-minion-containers.yml
index 2043416..a4ee2f6 100644
--- a/.github/workflows/virt-minion-containers.yml
+++ b/.github/workflows/virt-minion-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/zookeeper-containers.yml b/.github/workflows/zookeeper-containers.yml
index 700a8f8..8d0736b 100644
--- a/.github/workflows/zookeeper-containers.yml
+++ b/.github/workflows/zookeeper-containers.yml
@@ -143,7 +143,7 @@ jobs:
         if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform || 'no-platform'}}"
+          name: digests-${{ matrix.dockerinfo.name }}-${{ matrix.dockerinfo.tag }}-${{ matrix.dockerinfo.platform_slug }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
diff --git a/tools/ci.py b/tools/ci.py
index 00e7f5d..0183091 100644
--- a/tools/ci.py
+++ b/tools/ci.py
@@ -117,6 +117,7 @@ def matrix(ctx: Context, image: str, build_platforms: list[str] = None):
                     "file": str(fpath.relative_to(tools.utils.REPO_ROOT)),
                     "source_container": source_container,
                     "platform": "",
+                    "platform_slug": "all",
                 }
             )
         for entry in manifests:
@@ -130,6 +131,7 @@ def matrix(ctx: Context, image: str, build_platforms: list[str] = None):
                     "name": details["name"],
                     "tag": fpath.stem,
                     "platform": platform,
+                    "platform_slug": platform.replace("/", "-"),
                     "file": str(fpath.relative_to(tools.utils.REPO_ROOT)),
                     "source_container": source_container,
                 }