diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 577fde5c..f39b96e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,24 +100,28 @@ package-api-oci-alpine:
   extends:
     - .package-api-oci
   variables:
+    IMAGE_ARCH: alpine
     IMAGE_FILE: Containerfile.alpine
 
 package-api-oci-buster:
   extends:
     - .package-api-oci
   variables:
+    IMAGE_ARCH: buster
     IMAGE_FILE: Containerfile.buster
 
 package-gui-oci-alpine:
   extends:
     - .package-gui-oci
   variables:
+    IMAGE_ARCH: alpine
     IMAGE_FILE: Containerfile.alpine
 
 package-gui-oci-buster:
   extends:
     - .package-gui-oci
   variables:
+    IMAGE_ARCH: buster
     IMAGE_FILE: Containerfile.buster
 
 package-api-twine:
diff --git a/common/scripts/image-build.sh b/common/scripts/image-build.sh
index 19c5aa9c..7a0915f0 100755
--- a/common/scripts/image-build.sh
+++ b/common/scripts/image-build.sh
@@ -3,9 +3,8 @@
 IMAGE_PUSH="${1:---skip}"
 
 IMAGE_NAME="${CI_PROJECT_PATH}-${IMAGE_SUFFIX}"
-IMAGE_TAG="$(echo "${CI_COMMIT_TAG:-${CI_COMMIT_REF_SLUG}}" | sed -r 's/[^-_a-zA-Z0-9\\.]/-/g')"
+IMAGE_TAG="${IMAGE_ARCH}-$(echo "${CI_COMMIT_TAG:-${CI_COMMIT_REF_SLUG}}" | sed -r 's/[^-_a-zA-Z0-9\\.]/-/g')"
 
-IMAGE_SHORT="${IMAGE_NAME}:${IMAGE_TAG}"
 IMAGE_FULL="${IMAGE_NAME}:${IMAGE_TAG}"
 
 echo "Loading last image: ${IMAGE_FULL}"