diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 029eb22f4..0c6d23da2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,4 @@
-image: registry.gitlab.com/eighthave/ci-images-client:latest
-# re-enable once gitlab support fixes the repo :-/
-#image: registry.gitlab.com/fdroid/ci-images-client:latest
+image: registry.gitlab.com/fdroid/ci-images-client:latest
 
 cache:
   paths:
@@ -28,7 +26,7 @@ test:
     - ./gradlew test -PdisablePreDex || {
           for log in app/build/reports/*ests/*/*ml; do
               echo "read $log here:";
-              cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com;
+              (cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com) || true;
           done;
           export EXITVALUE=1;
       }
@@ -46,13 +44,13 @@ connected10:
     - ./gradlew connectedCheck -PdisablePreDex || {
         adb -e logcat -d '*:E';
         echo "get the full logcat here:";
-        adb -e logcat -d | curl --silent -F 'clbin=<-' https://clbin.com;
+        (adb -e logcat -d | curl --silent -F 'clbin=<-' https://clbin.com) || true;
         export EXITVALUE=1;
       }
     - for log in app/build/reports/*ests/*/*ml
                  app/build/outputs/*results*/connected/*.xml; do
         echo "read $log here:";
-        cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com;
+        (cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com) || true;
       done
   allow_failure: true
 
@@ -70,13 +68,13 @@ connected24:
     - ./gradlew connectedCheck -PdisablePreDex || {
         adb -e logcat -d '*:E';
         echo "get the full logcat here:";
-        adb -e logcat -d | curl --silent -F 'clbin=<-' https://clbin.com;
+        (adb -e logcat -d | curl --silent -F 'clbin=<-' https://clbin.com) || true;
         export EXITVALUE=1;
       }
     - for log in app/build/reports/*ests/*/*ml
                  app/build/outputs/*results*/connected/*.xml; do
         echo "read $log here:";
-        cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com;
+        (cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com) || true;
       done
     - exit $EXITVALUE