diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd24633b..bd1bd00b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -522,39 +522,34 @@ docker:manifest:rootless:
     - |
       docker manifest create $CI_REGISTRY_IMAGE-rootless:$CI_COMMIT_REF_SLUG \
         $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-        $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64 \
-        $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm-v7
+        $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64
       docker manifest push $CI_REGISTRY_IMAGE-rootless:$CI_COMMIT_REF_SLUG
     # Tag as latest on main branch or create version tags
     - |
       if [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
         docker manifest create $CI_REGISTRY_IMAGE-rootless:latest \
           $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-          $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64 \
-          $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm-v7
+          $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64
         docker manifest push $CI_REGISTRY_IMAGE-rootless:latest
       fi
     - |
       if [ -n "$CI_COMMIT_TAG" ]; then
         docker manifest create $CI_REGISTRY_IMAGE-rootless:$CI_COMMIT_TAG \
           $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-          $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64 \
-          $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm-v7
+          $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64
         docker manifest push $CI_REGISTRY_IMAGE-rootless:$CI_COMMIT_TAG
       
         MAJOR_MINOR=$(echo $CI_COMMIT_TAG | sed -E 's/^v?([0-9]+\.[0-9]+)\..*/\1/')
         if [ -n "$MAJOR_MINOR" ]; then
           docker manifest create $CI_REGISTRY_IMAGE-rootless:$MAJOR_MINOR \
             $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-amd64 \
-            $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64 \
-            $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm-v7
+            $CI_REGISTRY_IMAGE-rootless:${CI_COMMIT_REF_SLUG}-linux-arm64
           docker manifest push $CI_REGISTRY_IMAGE-rootless:$MAJOR_MINOR
         fi
       fi
   needs:
     - docker:build:rootless:amd64
     - docker:build:rootless:arm64
-    - docker:build:rootless:armv7
   rules:
     - if: $CI_COMMIT_TAG
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH