diff --git a/metadata/com.b44t.messenger.yml b/metadata/com.b44t.messenger.yml
index 1fefd2e5e9..80057ed7f6 100644
--- a/metadata/com.b44t.messenger.yml
+++ b/metadata/com.b44t.messenger.yml
@@ -13,7 +13,7 @@ OpenCollective: delta-chat
 AutoName: Delta Chat
 
 RepoType: git
-Repo: https://github.com/deltachat/deltachat-android
+Repo: https://github.com/deltachat/deltachat-android.git
 
 Builds:
   - versionName: 0.1.15
@@ -2386,13 +2386,10 @@ Builds:
 
   - versionName: 1.36.5
     versionCode: 6541
-    disable: fails to build
     commit: dc1d897b1a55b38e819913b4dbfd1b2cac22c647
     timeout: 20000
     submodules: true
     sudo:
-      - cd /opt/android-sdk/ndk
-      - rm -fr $(ls | sed 's/21.1.6352462//')
       - apt-get update
       - apt-get install -y make g++ cmake
     gradle:
@@ -2401,6 +2398,7 @@ Builds:
       - rustup@1.25.1
       - maplibre-gl-native@android-v9.5.2
     prebuild:
+      - sdkmanager 'ndk;20.0.5594570'
       - sed -i -e '/versionCode/s/$/1/' -e 's/abiFilters .*/abiFilters "armeabi-v7a"/'
         -e '/^repositories {/a mavenLocal()' build.gradle
       - sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle
@@ -2429,13 +2427,10 @@ Builds:
 
   - versionName: 1.36.5
     versionCode: 6542
-    disable: fails to build
     commit: dc1d897b1a55b38e819913b4dbfd1b2cac22c647
     timeout: 20000
     submodules: true
     sudo:
-      - cd /opt/android-sdk/ndk
-      - rm -fr $(ls | sed 's/21.1.6352462//')
       - apt-get update
       - apt-get install -y make g++ cmake
     gradle:
@@ -2444,6 +2439,7 @@ Builds:
       - rustup@1.25.1
       - maplibre-gl-native@android-v9.5.2
     prebuild:
+      - sdkmanager 'ndk;20.0.5594570'
       - sed -i -e '/versionCode/s/$/2/' -e 's/abiFilters .*/abiFilters "arm64-v8a"/'
         -e '/^repositories {/a mavenLocal()' build.gradle
       - sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle
@@ -2472,13 +2468,10 @@ Builds:
 
   - versionName: 1.36.5
     versionCode: 6543
-    disable: fails to build
     commit: dc1d897b1a55b38e819913b4dbfd1b2cac22c647
     timeout: 20000
     submodules: true
     sudo:
-      - cd /opt/android-sdk/ndk
-      - rm -fr $(ls | sed 's/21.1.6352462//')
       - apt-get update
       - apt-get install -y make g++ cmake
     gradle:
@@ -2487,6 +2480,7 @@ Builds:
       - rustup@1.25.1
       - maplibre-gl-native@android-v9.5.2
     prebuild:
+      - sdkmanager 'ndk;20.0.5594570'
       - sed -i -e '/versionCode/s/$/3/' -e 's/abiFilters .*/abiFilters "x86"/' -e
         '/^repositories {/a mavenLocal()' build.gradle
       - sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle
@@ -2515,13 +2509,10 @@ Builds:
 
   - versionName: 1.36.5
     versionCode: 6544
-    disable: fails to build
     commit: dc1d897b1a55b38e819913b4dbfd1b2cac22c647
     timeout: 20000
     submodules: true
     sudo:
-      - cd /opt/android-sdk/ndk
-      - rm -fr $(ls | sed 's/21.1.6352462//')
       - apt-get update
       - apt-get install -y make g++ cmake
     gradle:
@@ -2530,6 +2521,7 @@ Builds:
       - rustup@1.25.1
       - maplibre-gl-native@android-v9.5.2
     prebuild:
+      - sdkmanager 'ndk;20.0.5594570'
       - sed -i -e '/versionCode/s/$/4/' -e 's/abiFilters .*/abiFilters "x86_64"/'
         -e '/^repositories {/a mavenLocal()' build.gradle
       - sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle
@@ -2556,7 +2548,7 @@ Builds:
       - ANDROID_NDK_ROOT=$$NDK$$ scripts/ndk-make.sh x86_64
     ndk: r21b
 
-AutoUpdateMode: None
+AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v[\d.]+$
 VercodeOperation:
   - 10 * %c + 1