diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 165ca618f64daf1380e0ac254190b45a010474d3..223dc5463cdcb4ad6e1668eb3bcc2cbd3f1d21cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,6 @@
 include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
 
-flatpak:
-  extends: .flatpak
-  timeout: 90m
+.flatpak_vars:
   variables:
     GIT_SUBMODULE_STRATEGY: normal
 
@@ -17,7 +15,24 @@ flatpak:
     - flatpak --user install -y org.freedesktop.Sdk.Extension.llvm14//22.08
     - flatpak --user install -y org.freedesktop.Sdk.Extension.node18//22.08
 
-nightly:
+flatpak@x86_64:
+  extends: 
+    - '.flatpak_vars'
+    - '.flatpak@x86_64'
+  timeout: 90m
+
+flatpak@aarch64:
+  extends: 
+    - '.flatpak_vars'
+    - '.flatpak@aarch64'
+  timeout: 120m
+
+nightly@x86_64:
+  extends: '.publish_nightly'
+  needs:
+    - 'flatpak@x86_64'
+
+nightly@aarch64:
   extends: '.publish_nightly'
   needs:
-    - 'flatpak'
+    - 'flatpak@aarch64'