diff --git a/metadata/org.musicpd.yml b/metadata/org.musicpd.yml
index ffe84d6504..9a986ed483 100644
--- a/metadata/org.musicpd.yml
+++ b/metadata/org.musicpd.yml
@@ -373,43 +373,26 @@ Builds:
       - ninja android/apk/mpd-unsigned.apk
     ndk: r22b
 
-  - versionName: '0.23'
-    versionCode: 60
-    disable: build failed
-    commit: 163c59128ef3182e739d83888afa1caefa8b9616
+  - versionName: 0.23.10
+    versionCode: 69
+    commit: d6d0f78e93dfd73065d9384f58c486c175383134
     sudo:
       - apt-get update
-      - apt-get install -y ninja-build imagemagick-6.q16 -t stretch-backports
-      - apt-get install -y clang-7 libc++-7-dev libc++abi-7-dev
-      - pip3 install meson
-      - update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 100
-      - update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 100
-      - pushd build/srclib/cpython
-      - ./configure
-      - make -j`nproc`
-      - make altinstall
-      - popd
+      - apt-get install -y ninja-build imagemagick g++ meson cmake quilt pkg-config
+        xz-utils make libtool m4 automake librsvg2-bin
     output: output/android/android/apk/mpd-unsigned.apk
-    srclibs:
-      - cpython@v3.10.0
     prebuild:
       - mkdir -p output/android/android/classes/
-      - $$SDK$$/tools/bin/sdkmanager 'platforms;android-29' 'build-tools;29.0.3' >
-        /dev/null
-      - sed -i -e "/native/a cpp_args:['-stdlib=libc++','-nostdinc++','-I/usr/lib/llvm-7/include/c++/v1',],"
-        src/tag/meson.build
-      - sed -i -e "/native/a link_args:['-lc++abi','-L/usr/lib/llvm-7/lib','-Wl,-rpath,/usr/lib/llvm-7/lib',],"
-        src/tag/meson.build
-    scandelete:
-      - src/haiku/
+      - sdkmanager 'platforms;android-29' 'build-tools;29.0.3'
     build:
       - cd output/android/
-      - python3.10 ../../android/build.py $$SDK$$ $$NDK$$ armeabi-v7a
+      - python3 ../../android/build.py $$SDK$$ $$NDK$$ armeabi-v7a --buildtype=debugoptimized
+        -Db_ndebug=true -Dwrap_mode=forcefallback
       - meson configure
       - ninja android/apk/mpd-unsigned.apk
-    ndk: r22b
+    ndk: r23c
 
-AutoUpdateMode: None
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: 0.23.9
-CurrentVersionCode: 68
+CurrentVersion: 0.23.10
+CurrentVersionCode: 69