diff --git a/.gitea/workflows/build-apk.yaml b/.gitea/workflows/build-apk.yaml
index c3f1eb6..cb51eb9 100644
--- a/.gitea/workflows/build-apk.yaml
+++ b/.gitea/workflows/build-apk.yaml
@@ -25,6 +25,7 @@ jobs:
   build-android:
     name: Build Release APKs
     runs-on: ubuntu-latest
+    timeout-minutes: 180
     permissions:
       contents: write
     container:
@@ -118,8 +119,8 @@ jobs:
             # the NDK Flutter expects up front and swap in Ubuntu's native arm64 llvm-strip.
             NDK_VERSION="$(sed -nE 's/.*ndkVersion: String = "([^"]+)".*/\1/p' "${FLUTTER_ROOT:-/sdks/flutter}/packages/flutter_tools/gradle/src/main/kotlin/FlutterExtension.kt")"
             [ -n "$NDK_VERSION" ] || { echo "::error::Could not determine Flutter's NDK version"; exit 1; }
-            echo "Installing NDK $NDK_VERSION ..."
-            yes | sdkmanager --install "ndk;${NDK_VERSION}" > /dev/null
+            echo "Installing NDK $NDK_VERSION and Android SDK platforms 34 & 35 ..."
+            yes | sdkmanager --install "platforms;android-34" "platforms;android-35" "ndk;${NDK_VERSION}" > /dev/null
             NDK_BIN="${ANDROID_HOME:-/opt/android-sdk-linux}/ndk/${NDK_VERSION}/toolchains/llvm/prebuilt/linux-x86_64/bin"
             for tool in llvm-strip llvm-objcopy; do
               mv "$NDK_BIN/$tool" "$NDK_BIN/$tool.x86_64"
@@ -162,20 +163,52 @@ jobs:
           flutter analyze
           flutter test
 
-      - name: Build Universal Release APK
-        run: flutter build apk --release
-
-      - name: Build Split-per-ABI Release APKs
-        run: flutter build apk --release --split-per-abi
+      - name: Build Release APKs (Split-per-ABI & Universal)
+        run: |
+          flutter build apk --release --split-per-abi
+          mkdir -p release-apks
+          # Locate universal APK generated by AGP splits
+          for f in \
+            build/app/outputs/flutter-apk/app-universal-release.apk \
+            build/app/outputs/flutter-apk/*universal*.apk \
+            android/app/build/outputs/apk/release/app-universal-release.apk \
+            android/app/build/outputs/apk/release/*universal*.apk \
+            build/app/outputs/flutter-apk/app-release.apk \
+            android/app/build/outputs/apk/release/app-release.apk; do
+            if [ -f "$f" ]; then
+              echo "Found universal APK at $f"
+              cp "$f" release-apks/oggauer-gemeindetrommler-universal.apk
+              break
+            fi
+          done
+          # Fallback: if universal APK was not created by split build, build it explicitly
+          if [ ! -f release-apks/oggauer-gemeindetrommler-universal.apk ]; then
+            echo "Universal APK not found from split build; running fallback universal build..."
+            flutter build apk --release
+            if [ -f build/app/outputs/flutter-apk/app-release.apk ]; then
+              cp build/app/outputs/flutter-apk/app-release.apk release-apks/oggauer-gemeindetrommler-universal.apk
+            elif [ -f android/app/build/outputs/apk/release/app-release.apk ]; then
+              cp android/app/build/outputs/apk/release/app-release.apk release-apks/oggauer-gemeindetrommler-universal.apk
+            fi
+          fi
 
       - name: Organize Artifacts
         run: |
           mkdir -p release-apks
-          # Copy universal APK
-          if [ -f build/app/outputs/flutter-apk/app-release.apk ]; then
-            cp build/app/outputs/flutter-apk/app-release.apk release-apks/oggauer-gemeindetrommler-universal.apk
-          elif [ -f android/app/build/outputs/apk/release/app-release.apk ]; then
-            cp android/app/build/outputs/apk/release/app-release.apk release-apks/oggauer-gemeindetrommler-universal.apk
+          # Copy universal APK if not already in release-apks
+          if [ ! -f release-apks/oggauer-gemeindetrommler-universal.apk ]; then
+            for f in \
+              build/app/outputs/flutter-apk/app-universal-release.apk \
+              build/app/outputs/flutter-apk/*universal*.apk \
+              android/app/build/outputs/apk/release/app-universal-release.apk \
+              android/app/build/outputs/apk/release/*universal*.apk \
+              build/app/outputs/flutter-apk/app-release.apk \
+              android/app/build/outputs/apk/release/app-release.apk; do
+              if [ -f "$f" ]; then
+                cp "$f" release-apks/oggauer-gemeindetrommler-universal.apk
+                break
+              fi
+            done
           fi
           # Copy split APKs
           for apk in build/app/outputs/flutter-apk/*.apk android/app/build/outputs/apk/release/*.apk; do
diff --git a/android/app/build.gradle b/android/app/build.gradle
index c7b00ab..30aa6a4 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -34,10 +34,24 @@ android {
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
         }
     }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include "arm64-v8a", "armeabi-v7a", "x86_64"
+            universalApk true
+        }
+    }
+}
+
+afterEvaluate {
+    tasks.named('assembleRelease').configure {
+        dependsOn 'packageReleaseUniversalApk'
+    }
 }
 
 kotlin {