diff --git a/.gitignore b/.gitignore
index 992cad4..64db417 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ src/static_resources.rs
 *.*~
 builddir/
 .flatpak/
+.flatpak-builder/
+app/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9bfb541..da8e1d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,9 @@
-include:
-  - project: "gnome/citemplates"
-    file: "flatpak/flatpak_ci_initiative.yml"
+variables:
+    BUNDLE: "authenticator-nightly.flatpak"
+    MANIFEST_PATH: "build-aux/com.belmoussaoui.Authenticator.Devel.json"
+    FLATPAK_MODULE: "authenticator"
+    APP_ID: "com.belmoussaoui.Authenticator.Devel"
+    RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
 
 stages:
   - check
@@ -10,13 +13,20 @@ stages:
 flatpak:
   image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master"
   stage: test
-  variables:
-    BUNDLE: "authenticator-nightly.flatpak"
-    MANIFEST_PATH: "build-aux/com.belmoussaoui.Authenticator.Devel.json"
-    FLATPAK_MODULE: "authenticator"
-    APP_ID: "com.belmoussaoui.Authenticator.Devel"
-    RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
-  extends: ".flatpak"
+  script:
+    - >
+      xvfb-run -a -s "-screen 0 1024x768x24"
+      flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse flatpak_app --repo=repo ${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH}
+    - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID} ${BRANCH}
+  artifacts:
+    name: 'Flatpak artifacts'
+    expose_as: 'Get Flatpak bundle here'
+    when: 'always'
+    paths:
+      - "${BUNDLE}"
+      - '.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/meson-log.txt'
+      - '.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/testlog.txt'
+    expire_in: 14 days
 
 rustfmt:
   image: "rust:slim"
diff --git a/build-aux/com.belmoussaoui.Authenticator.Devel.json b/build-aux/com.belmoussaoui.Authenticator.Devel.json
index f27e1cc..df612e3 100644
--- a/build-aux/com.belmoussaoui.Authenticator.Devel.json
+++ b/build-aux/com.belmoussaoui.Authenticator.Devel.json
@@ -17,6 +17,10 @@
     "build-options": {
         "append-path": "/usr/lib/sdk/rust-stable/bin",
         "build-args": ["--share=network"],
+        "test-args": [
+            "--socket=x11",
+            "--share=network"
+        ],
         "env": {
             "CARGO_HOME": "/run/build/authenticator/cargo",
             "RUST_BACKTRACE": "1",
@@ -74,6 +78,7 @@
         {
             "name": "authenticator",
             "buildsystem": "meson",
+            "run-tests": true,
             "config-opts": ["-Dprofile=development"],
             "sources": [
                 {