diff --git a/.github/workflows/base-glibc-busybox-bash.yaml b/.github/workflows/base-glibc-busybox-bash.yaml
index 9c0c4169..8a141e31 100644
--- a/.github/workflows/base-glibc-busybox-bash.yaml
+++ b/.github/workflows/base-glibc-busybox-bash.yaml
@@ -92,6 +92,9 @@ jobs:
           image_id="$( buildah commit "${container}" )"
           buildah rm "${container}"
           for tag in ${tags} ; do
+            buildah tag \
+              "${image_id}" \
+              "${image_name}:${tag}-${arch}"
             buildah manifest add \
               "${image_name}:${tag}" \
               "${image_id}"
diff --git a/.github/workflows/base-glibc-debian-bash.yaml b/.github/workflows/base-glibc-debian-bash.yaml
index f0571986..c6ff0ce5 100644
--- a/.github/workflows/base-glibc-debian-bash.yaml
+++ b/.github/workflows/base-glibc-debian-bash.yaml
@@ -82,6 +82,9 @@ jobs:
           image_id="$( buildah commit "${container}" )"
           buildah rm "${container}"
           for tag in ${tags} ; do
+            buildah tag \
+              "${image_id}" \
+              "${image_name}:${tag}-${arch}"
             buildah manifest add \
               "${image_name}:${tag}" \
               "${image_id}"