diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 418d89757..882fd8e26 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,9 +42,6 @@ jobs:
         with:
           cache-read-only: true
 
-      - name: Install NDK
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.0.11902837"
-
       - name: Spotless Check
         run: ./gradlew spotlessCheck
 
@@ -63,9 +60,6 @@ jobs:
           distribution: temurin
           java-version: 21
 
-      - name: Install NDK
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.0.11902837"
-
       - name: Install Rust Toolchain
         run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android && rustup component add rustfmt clippy
 
@@ -136,9 +130,6 @@ jobs:
           distribution: temurin
           java-version: 21
 
-      - name: Install NDK
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.0.11902837"
-
       - name: Install Rust Toolchain
         run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android && rustup component add rustfmt clippy
 
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 36cbb646d..b559daa8e 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -19,7 +19,7 @@ jobs:
           java-version: 21
 
       - name: Free disk space
-        run: rm -rf ${ANDROID_SDK_ROOT}/ndk
+        run: rm -rf ${ANDROID_SDK_ROOT}/ndk/(!27*)
 
       - name: Enable KVM group perms
         run: |
@@ -27,9 +27,6 @@ jobs:
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
-      - name: Install NDK
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.0.11902837"
-
       - name: Install Rust Toolchain
         run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android x86_64-linux-android
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 32edbc998..9aa6e6a5e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,6 +1,7 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
 import com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 
 val isRelease: Boolean
     get() = gradle.startParameter.taskNames.any { it.contains("Release") }
@@ -23,7 +24,7 @@ val supportedAbis = arrayOf("arm64-v8a", "x86_64", "armeabi-v7a")
 android {
     compileSdk = 35
     buildToolsVersion = "35.0.0"
-    ndkVersion = "27.0.11902837-rc1"
+    ndkVersion = "27.0.12077973"
     androidResources.generateLocaleConfig = true
 
     splits {
@@ -175,7 +176,7 @@ android {
 }
 
 composeCompiler {
-    enableNonSkippingGroupOptimization = true
+    featureFlags = setOf(ComposeFeatureFlag.OptimizeNonSkippingGroups)
 }
 
 androidComponents {