diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4aaf47a8a..3714967aec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,17 +77,17 @@ fdroid-buildserver:
     - git -C /home/fdroid/fdroidserver checkout -B master origin/master
     - export PATH="$HOME/fdroidserver:$PATH"
     - if [ "$CI_PROJECT_NAMESPACE" = "fdroid" ]; then
-          export EXTRA_FLAGS="-Werror";
           export head=HEAD^^^;
+          echo ORIG_HEAD `git diff --name-only --diff-filter=d ORIG_HEAD...HEAD
+             | sed -n -e 's,^metadata/\([^/][^/]*\)\.txt,\1,p' -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'`;
       else
-          export EXTRA_FLAGS="-Wwarn --test --force";
           git fetch https://gitlab.com/fdroid/fdroiddata.git;
           export head=FETCH_HEAD;
       fi
     - export appids=`git diff --name-only --diff-filter=d $head...HEAD
          | sed -n -e 's,^metadata/\([^/][^/]*\)\.txt,\1,p' -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'`
     - echo $appids | grep '\w' || exit 0
-    - fdroid build --verbose --server --stop $EXTRA_FLAGS --latest $appids
+    - fdroid build --verbose --server --stop --no-tarball --latest $appids
     - find unsigned -maxdepth 0 -empty -exec exit 0 \;
     - cd ~/libscout
     - java -jar build/LibScout.jar -o match -a lib/android-23.jar -p profiles