diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 61e072e27..e4e4dd4a1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,6 +56,9 @@ jobs:
           key: ${{ runner.os }}-cmake-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
           restore-keys: ${{ runner.os }}-cmake-
 
+      - name: Install Build Tools
+        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "build-tools;35.0.0-rc1"
+
       - name: Build OSS
         run: ./gradlew assembleDefaultOssRelease
 
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 35268ea2e..d91d522ed 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -38,6 +38,9 @@ jobs:
           key: ${{ runner.os }}-cmake-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
           restore-keys: ${{ runner.os }}-cmake-
 
+      - name: Install Build Tools
+        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "build-tools;35.0.0-rc1"
+
       - name: Gradle Build
         uses: gradle/gradle-build-action@v3
         with:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 615ebe93a..28f9d8ee4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,8 +19,8 @@ plugins {
 }
 
 android {
-    compileSdk = 34
-    buildToolsVersion = "34.0.0"
+    compileSdkPreview = "VanillaIceCream"
+    buildToolsVersion = "35.0.0-rc1"
     ndkVersion = "26.2.11394342"
 
     splits {
diff --git a/build.gradle.kts b/build.gradle.kts
index 5c0f12197..b3617a83a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,13 +8,3 @@ plugins {
     alias(libs.plugins.aboutlibrariesPlugin) apply false
     alias(libs.plugins.composeCompilerReportGenerator) apply false
 }
-
-tasks.register("Delete", Delete::class) {
-    delete(rootProject.layout.buildDirectory)
-}
-
-buildscript {
-    dependencies {
-        classpath(libs.r8)
-    }
-}
diff --git a/gradle.properties b/gradle.properties
index 3aedc6399..323d3bef6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,4 +22,5 @@ org.gradle.caching=true
 android.useAndroidX=true
 android.enableAppCompileTimeRClass=true
 android.experimental.enableNewResourceShrinker.preciseShrinking=true
-android.experimental.lint.version=8.4.0-alpha01
+android.injected.testOnly=false
+android.suppressUnsupportedCompileSdk=VanillaIceCream
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c517abb49..e98ef7ad1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 aboutlibraries = "10.10.0"
-agp = "8.2.2"
-android-tools-r8 = "8.3.31"
+agp = "8.4.0-alpha10"
 androidx-activity = "1.8.2"
 androidx-appcompat = "1.6.1"
 androidx-biometric = "1.2.0-alpha05"
@@ -104,8 +103,6 @@ okio-jvm = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" }
 
 photoview = "com.github.chrisbanes:PhotoView:2.3.0"
 
-r8 = { module = "com.android.tools:r8", version.ref = "android-tools-r8" }
-
 reorderable = "sh.calvin.reorderable:reorderable:1.3.1"
 
 serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serialization-cbor", version.ref = "kotlinx-serialization" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2de3c9457..3ed9e596e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,7 +3,6 @@ pluginManagement {
         gradlePluginPortal()
         google()
         mavenCentral()
-        maven("https://storage.googleapis.com/r8-releases/raw")
     }
 }