diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba8e0d59..7f4d3cfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,17 +103,6 @@ debugTests:
 connected 27 default x86_64:
   <<: *connected-template
 
-fdroid build:
-  stage: build
-  image: registry.gitlab.com/fdroid/ci-images-client:latest
-  tags:
-    - server_artectrex
-  artifacts:
-    paths:
-      - signed/
-    when: always
-  only:
-    - tags
   cache:
     key: "$CI_JOB_NAME"
     paths:
@@ -124,13 +113,16 @@ fdroid build:
 fdroid build:
   stage: build
   image: registry.gitlab.com/mvglasow/ci-images-server:latest
+  tags:
+    - server_artectrex
   allow_failure: true
   artifacts:
     # name: "${CI_PROJECT_PATH}_${CI_JOB_STAGE}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHA}"
     paths:
       - signed/
-      - unsigned/
     when: always
+  only:
+    - tags
   cache:
     key: "$CI_JOB_NAME"
     paths: