diff --git a/.gitlab/ci/targets_rootfs.yml b/.gitlab/ci/targets_rootfs.yml
index 98888aa..49b8940 100644
--- a/.gitlab/ci/targets_rootfs.yml
+++ b/.gitlab/ci/targets_rootfs.yml
@@ -1,18 +1,18 @@
-
 deploy-rootfs_x86-64:
   extends: .deploy-rootfs
   variables:
     TARGET: x86-64
-
+    ARCH: x86_64
 
 deploy-rootfs_armvirt-32:
   extends: .deploy-rootfs
   variables:
     TARGET: armvirt-32
-
+    ARCH: arm_cortex-a15_neon-vfpv4
 
 deploy-rootfs_armvirt-64:
   extends: .deploy-rootfs
   variables:
     TARGET: armvirt-64
+    ARCH: aarch64_generic
 
diff --git a/docker-build.sh b/docker-build.sh
index 72cbda2..74babb8 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -8,7 +8,14 @@ DOCKERFILE="${DOCKERFILE:-Dockerfile}"
 cp "$DOCKERFILE" ./build/
 docker build -t "$DOCKER_IMAGE:$TARGET-$BRANCH" -f "./build/$DOCKERFILE" ./build
 
+if [ -n "$ARCH" ]; then
+    docker tag "$DOCKER_IMAGE:$TARGET-$BRANCH" "$DOCKER_IMAGE:$ARCH-$BRANCH"
+fi
+
 if [ "$BRANCH" == "master" ]; then
+    if [ -n "$ARCH" ]; then
+        docker tag "$DOCKER_IMAGE:$TARGET-$BRANCH" "$DOCKER_IMAGE:$ARCH"
+    fi
     docker tag "$DOCKER_IMAGE:$TARGET-$BRANCH" "$DOCKER_IMAGE:$TARGET"
     if [ "$TARGET" == "x86-64" ]; then
         docker tag "$DOCKER_IMAGE:$TARGET-$BRANCH" "$DOCKER_IMAGE:latest"