diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9e995c8c..7d3c4aae1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,16 +3,15 @@ stages:
   - deploy
 
 .base:
-  # image: registry.gitlab.com/fdroid/ci-images-client:latest # TODO use once CI can handle Java 11
-  image: briar/ci-image-android:latest
+  image: registry.gitlab.com/fdroid/ci-images-client:latest
   before_script:
     - export GRADLE_USER_HOME=$PWD/.gradle
-    #- export ANDROID_COMPILE_SDK=`sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' app/build.gradle`
-    #- alias sdkmanager="sdkmanager --no_https"
-    #- echo y | sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" > /dev/null
+    - export ANDROID_COMPILE_SDK=`sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' app/build.gradle`
+    - alias sdkmanager="sdkmanager --no_https"
+    - echo y | sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" > /dev/null
     # limit RAM usage for all gradle runs
-    #- export maxmem=$(expr $(sed -n 's,^MemAvailable:[^0-9]*\([0-9][0-9]*\)[^0-9]*$,\1,p' /proc/meminfo) / 1024 / 2 / 1024 \* 1024)
-    #- printf "\norg.gradle.jvmargs=-Xmx${maxmem}m -XX:MaxPermSize=${maxmem}m\norg.gradle.daemon=false\norg.gradle.parallel=false\n" >> gradle.properties
+    - export maxmem=$(expr $(sed -n 's,^MemAvailable:[^0-9]*\([0-9][0-9]*\)[^0-9]*$,\1,p' /proc/meminfo) / 1024 / 2 / 1024 \* 1024)
+    - printf "\norg.gradle.jvmargs=-Xmx${maxmem}m -XX:MaxPermSize=${maxmem}m\norg.gradle.daemon=false\norg.gradle.parallel=false\n" >> gradle.properties
   after_script:
     # this file changes every time but should not be cached
     - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
@@ -56,10 +55,9 @@ test_lint_pmd_checkstyle:
     - ./gradlew pmd || set_error
     - ./gradlew checkstyle || set_error
     - ./gradlew ktlintCheck || set_error
-    # TODO re-add once on new CI
-    #- ./tools/check-format-strings.py || set_error
-    #- ./tools/check-fastlane-whitespace.py || set_error
-    #- ./tools/remove-unused-and-blank-translations.py || set_error
+    - ./tools/check-format-strings.py || set_error
+    - ./tools/check-fastlane-whitespace.py || set_error
+    - ./tools/remove-unused-and-blank-translations.py || set_error
     - echo "These are unused or blank translations that should be removed:"
     - git --no-pager diff --ignore-all-space --name-only --exit-code app/src/*/res/values*/strings.xml || set_error
     - exit $EXITVALUE
@@ -68,8 +66,12 @@ errorprone:
   extends: .base
   stage: test
   script:
+    - apt-get update
+    - apt-get install -t stretch-backports openjdk-11-jdk-headless
+    - update-java-alternatives --set java-1.11.0-openjdk-amd64
+    - export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64
     - cat config/errorprone.gradle >> app/build.gradle
-    - ./gradlew --dependency-verification lenient assembleDebug
+    - ./gradlew -Dorg.gradle.dependency.verification=lenient assembleDebug
 
 # Run the tests in the emulator.  Each step is broken out to run on
 # its own since the CI runner can have limited RAM, and the emulator
@@ -79,9 +81,6 @@ errorprone:
 # connectedCheck to test all the build flavors
 .connected-template: &connected-template
   extends: .base
-  image: briar/ci-image-android-emulator:latest # TODO remove once CI can handle Java 11
-  tags:
-    - kvm
   script:
     - ./gradlew assembleFullDebug
     - export AVD_SDK=`echo $CI_JOB_NAME | awk '{print $2}'`
@@ -90,19 +89,14 @@ errorprone:
     - export AVD_PACKAGE="system-images;android-${AVD_SDK};${AVD_TAG};${AVD_ARCH}"
     - echo $AVD_PACKAGE
 
-    - $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager --verbose delete avd --name "$NAME_AVD"
-    - export AVD="$AVD_PACKAGE"
-    - echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "$AVD"
-    - echo no | $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager --verbose create avd --name "$NAME_AVD" --package "$AVD" --device "pixel"
-    - start-emulator.sh
-    #- alias sdkmanager
-    #- ls -l ~/.android
+    - alias sdkmanager
+    - ls -l ~/.android
 
-    #- adb start-server
-    #- start-emulator
-    #- wait-for-emulator
-    #- adb devices
-    #- adb shell input keyevent 82 &
+    - adb start-server
+    - start-emulator
+    - wait-for-emulator
+    - adb devices
+    - adb shell input keyevent 82 &
     - ./gradlew installFullDebug
     - adb shell am start -n org.fdroid.fdroid.debug/org.fdroid.fdroid.views.main.MainActivity
     - if [ $AVD_SDK -lt 25 ] || ! emulator -accel-check; then
@@ -133,8 +127,6 @@ deploy_nightly:
   only:
     - master
   script:
-    - apt-get update
-    - apt-get -y install fdroidserver
     - test -z "$DEBUG_KEYSTORE" && exit 0
     - sed -i
         's,<string name="app_name">.*</string>,<string name="app_name">F-Nightly</string>,'