diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3daaf61..5b0b295 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-build:docs:
+docs:
   image: 123marvin123/typst:latest
   stage: build
   script:
@@ -7,13 +7,14 @@ build:docs:
     paths:
       - ./Flashcards.pdf
 
-build:flatpak:
+flatpak:
   image: quay.io/gnome_infrastructure/gnome-runtime-images:gnome-47
+  stage: build
   variables:
     APP_ID: "li.sopht.Flashcards"
     BUNDLE: "${APP_ID}.flatpak"
     MANIFEST_PATH: "${APP_ID}.json"
     RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
   script:
-    - flatpak-builder ${CI_FB_ARGS} --keep-build-dirs --user --disable-rofiles-fuse --build-only flatpak_app --repo=repo ${MANIFEST_PATH}
-    - flatpak build-bundle --runtime-repo=${RUNTIME_REPO} repo ${BUNDLE} ${APP_ID}
+    - flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse --build-only flatpak_app --repo=repo ${MANIFEST_PATH}
+    - flatpak build-bundle repo ${BUNDLE} ${EXPORT_RUNTIME} --runtime-repo="${RUNTIME_REPO}" ${APP_ID}