diff --git a/ci-automation/ci_automation_common.sh b/ci-automation/ci_automation_common.sh
index 68fb2aa481..f6e75bcaa5 100644
--- a/ci-automation/ci_automation_common.sh
+++ b/ci-automation/ci_automation_common.sh
@@ -251,7 +251,9 @@ function docker_image_from_registry_or_buildcache() {
         return
     fi
     echo "Final fallback: arch specific container image" >&2
-    docker_image_from_buildcache "${image}" "${version}-$(get_sdk_arch)"
+    if docker_image_from_buildcache "${image}" "${version}-$(get_sdk_arch)"; then
+        $docker tag "${CONTAINER_REGISTRY}/${image}:${version}-$(get_sdk_arch)" "${CONTAINER_REGISTRY}/${image}:${version}"
+    fi
 }
 # --