diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38c3e43b..d9202474 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -247,7 +247,6 @@ build-docker-main:
   script:
     - docker buildx build --push --platform linux/amd64 -t framasoft/mobilizon:main -f docker/production/Dockerfile .
 
-# Don't push to latest when building beta/rc tags
 build-and-push-to-latest-docker-tag:
   <<: *docker
   rules: &release-tag-rules
@@ -260,11 +259,31 @@ build-and-push-to-latest-docker-tag:
     - >
       docker buildx build
       --push
-      --platform linux/amd64,linux/arm
+      --platform linux/amd64
       -t framasoft/mobilizon:$CI_COMMIT_TAG
       -t framasoft/mobilizon:latest
       -f docker/production/Dockerfile .
 
+build-and-push-to-latest-docker-tag-cross:
+  <<: *docker
+  rules: &release-tag-rules
+    - if: '$CI_PROJECT_NAMESPACE != "framasoft"'
+      when: never
+    - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG !~ /alpha|beta|rc/
+      when: on_success
+  timeout: 3 hours
+  allow_failure: true
+  script:
+    - >
+      docker buildx build
+      --push
+      --platform linux/arm, linux/arm64
+      -t framasoft/mobilizon:$CI_COMMIT_TAG
+      -t framasoft/mobilizon:latest
+      -f docker/production/Dockerfile .
+
+
+# Don't push to latest when building beta/rc tags
 build-and-push-docker-tag:
   <<: *docker
   rules: &pre-release-tag-rules
@@ -277,7 +296,7 @@ build-and-push-docker-tag:
     - >
       docker buildx build
       --push
-      --platform linux/amd64,linux/arm
+      --platform linux/amd64
       -t framasoft/mobilizon:$CI_COMMIT_TAG
       -f docker/production/Dockerfile .