diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 420aa75b10dc7c49077990a09896a58721169217..1b77ba991b7efa8edcb8f7c4c25edef4a31f118a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,39 @@
-fedora:
+include:
+    - component: "gitlab.gnome.org/GNOME/citemplates/release-service@master"
+      inputs:
+          dist-job-name: "fedora-dist"
+          tarball-artifact-path: $TARBALL_ARTIFACT_PATH
+
+stages:
+    - prepare
+    - build
+    - deploy
+
+variables:
+    MESON_BUILD_DIR: _build
+    TARBALL_ARTIFACT_PATH: "$MESON_BUILD_DIR/meson-dist/$CI_PROJECT_NAME-$CI_COMMIT_TAG.tar.xz"
+
+.build:
+    stage: build
     image:
         name: registry.gitlab.gnome.org/gnome/gvfs:latest
         entrypoint: ["/bin/sh", "-c"]
+
+fedora-dist:
+    extends: .build
+    script:
+        - git config --global --add safe.directory $CI_PROJECT_DIR
+        - meson setup $MESON_BUILD_DIR
+        - meson dist -C $MESON_BUILD_DIR
+    artifacts:
+        paths:
+            - $TARBALL_ARTIFACT_PATH
+    only:
+        - tags
+        - web
+
+fedora-test:
+    extends: .build
     script:
         # The httpd process fails with "(98)Address already in use: AH00072:
         # make_sock: could not bind to address 127.0.0.1:8088" error. It used to
@@ -15,13 +47,16 @@ fedora:
           -Dman=true
           -Dburn=true
           -Dunit_tests=true
-          --prefix /usr --werror build
-        - sudo ninja -C build install
+          --prefix /usr --werror $MESON_BUILD_DIR
+        - sudo ninja -C $MESON_BUILD_DIR install
         - GIO_USE_VOLUME_MONITOR=unix gnome-desktop-testing-runner gvfs
-        - dbus-run-session -- sh -c "gio mount localtest:/// && build/test/unit/outputstream localtest:///tmp/"
+        - dbus-run-session -- sh -c "gio mount localtest:/// && $MESON_BUILD_DIR/test/unit/outputstream localtest:///tmp/"
     allow_failure: true
+    except:
+        - tags
 
 update-image:
+    stage: prepare
     variables:
          STORAGE_DRIVER: vfs
          BUILDAH_FORMAT: docker