diff --git a/.github/workflows/docker-multi-arch-regular.yml b/.github/workflows/docker-multi-arch-regular.yml
index e6ee25c..9a9bb30 100644
--- a/.github/workflows/docker-multi-arch-regular.yml
+++ b/.github/workflows/docker-multi-arch-regular.yml
@@ -110,9 +110,10 @@ jobs:
               echo "release tag"
               tags="$image_name:${distro_friendly_name}-${squeezelite_version_str}"
               tags="$tags,$image_name:${distro_friendly_name}-${squeezelite_version_str}-${tag_name}"
+              special_tag_lookup="${{ matrix.base }}-${{ matrix.sourceforge }}"
+              select_special_tags=${special_tags["${special_tag_lookup}"]}
               building_now="${distro_friendly_name}-${{ matrix.sourceforge }}"
               echo "Building now: ["$building_now"]"
-              select_special_tags=${special_tags["${building_now}"]}
               if [[ -n "${select_special_tags}" ]]; then
                 echo "Found special tags for ["${building_now}"]=["${select_special_tags}"]"
                 tags="$tags,${select_special_tags}"