diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07d3af5871d86928bd7f7024483f56113115e2d7..d6cf5bbf0ebba4819077d543af12fd2589ed9856 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 stages:
-  - test
+  # - test
+  - build
 
 variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
@@ -8,12 +9,59 @@ cache:
   paths:
     - .cache/pip
 
-test:
-  stage: test
-  image: python:3.6
+# test:
+#   stage: test
+#   image: python:3.6
+#   before_script:
+#     - pip install .[dev]
+#   script:
+#     - pytest
+#   tags:
+#     - docker
+
+
+# build-linux:
+#   stage: build
+#   image: python:3.6
+#   before_script:
+#     - pip install .[dev]
+#   script:
+#     - pyinstaller --clean -y cli.spec --distpath .
+#     - echo "Testing the generated CLI works…" && ./funkwhale --help && echo "funkwhale CLI working \o/"
+#   artifacts:
+#     name: "linux_${CI_COMMIT_REF_NAME}"
+#     paths:
+#       - funkwhale
+#   # only:
+#   #   - tags@funkwhale/funkwhale
+#   #   - master@funkwhale/funkwhale
+
+#   tags:
+#     - docker
+
+
+build-windows:
+  stage: build
+  image:
+    name: cdrx/pyinstaller-windows:python3
+    entrypoint: bash
+  variables:
+    CI_DEBUG_TRACE: "true"
   before_script:
+
+    - wine
     - pip install .[dev]
   script:
-    - pytest
+    - pyinstaller --clean -y cli.spec --distpath .
+    - echo "Testing the generated CLI works…" && wine ./funkwhale.exe --help && echo "funkwhale CLI working \o/"
+  artifacts:
+    name: "linux_${CI_COMMIT_REF_NAME}"
+    paths:
+      - funkwhale
+  # only:
+  #   - tags@funkwhale/funkwhale
+  #   - master@funkwhale/funkwhale
+
   tags:
     - docker
+    - debug