diff --git a/metadata/org.xcsoar.txt b/metadata/org.xcsoar.txt
index 10becd7af9..55304a33cd 100644
--- a/metadata/org.xcsoar.txt
+++ b/metadata/org.xcsoar.txt
@@ -147,33 +147,30 @@ Build:6.8.7,107
 
 Build:6.8.8,108
     commit=v6.8.8
-    subdir=android
     submodules=yes
-    output=../output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk
-    build=cd .. && \
-        for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
-        break; done
-    ndk=r10e
+    sudo=apt-get install -y g++
+    output=output/ANDROID7/opt/build/unsigned.apk
+    rm=android/ioio/software/IOIODude/lib,android/ioio/software/IOIOLib/target/pc/lib,android/ioio/software/applications/IOIOConnectionTester/lib
+    build=make TARGET=ANDROID7 DEBUG=n TESTING=n -j`nproc`
+    ndk=r15c
 
 Build:6.8.9b,110
     commit=v6.8.9b
-    subdir=android
     submodules=yes
-    output=../output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk
-    build=cd .. && \
-        for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
-        break; done
-    ndk=r10e
+    sudo=apt-get install -y g++
+    output=output/ANDROID7/opt/build/unsigned.apk
+    rm=android/ioio/software/IOIODude/lib,android/ioio/software/IOIOLib/target/pc/lib,android/ioio/software/applications/IOIOConnectionTester/lib
+    build=make TARGET=ANDROID7 DEBUG=n TESTING=n -j`nproc`
+    ndk=r15c
 
 Build:6.8.10,111
     commit=v6.8.10
-    subdir=android
     submodules=yes
-    output=../output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk
-    build=cd .. && \
-        for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
-        break; done
-    ndk=r10e
+    sudo=apt-get install -y g++
+    output=output/ANDROID7/opt/build/unsigned.apk
+    rm=android/ioio/software/IOIODude/lib,android/ioio/software/IOIOLib/target/pc/lib,android/ioio/software/applications/IOIOConnectionTester/lib
+    build=make TARGET=ANDROID7 DEBUG=n TESTING=n -j`nproc`
+    ndk=r15c
 
 Maintainer Notes:
 The makefile setup is not perfect, so we need to run it a few times to get it to succeed.