diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c40f35a6e9e94d95746e424eb02b3abf53580af..e8ce5963eeb074b73f1514c20b773f2fa0b75b61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,13 +71,25 @@ test:
     # override the policy
     policy: pull-push
   
-test_nonfree_code:
+test_nonfree_code_dev:
   stage: test-after-build
   image: registry.funkwhale.audio/funkwhale/ci/android-fdroidserver
   script:
     - fdroid scanner -v app/build/outputs/apk/debug/app-debug.apk |& tee output.txt
     - cat output.txt
     - (! grep "CRITICAL" output.txt)
+  except: 
+    - tags
+
+test_nonfree_code_release:
+  stage: test-after-build
+  image: registry.funkwhale.audio/funkwhale/ci/android-fdroidserver
+  script:
+    - fdroid scanner -v app/build/outputs/apk/release/app-release.apk |& tee output.txt
+    - cat output.txt
+    - (! grep "CRITICAL" output.txt)
+  only:
+    - tags
 
 coverage:
   stage: visualize