diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9ecfd3a5..f5273c32 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -133,19 +133,12 @@ val optimizeReleaseRes = task("optimizeReleaseRes").doLast {
         androidComponents.sdkComponents.sdkDirectory.get().asFile,
         "build-tools/${androidBuildToolsVersion}/aapt2"
     )
-    val mapping = Paths.get(
-        project.buildDir.path,
-        "outputs",
-        "mapping",
-        "release",
-        "shortening.txt"
-    )
     val zip = Paths.get(
         project.buildDir.path,
         "intermediates",
-        "shrunk_processed_res",
+        "optimized_processed_res",
         "release",
-        "resources-release-stripped.ap_"
+        "resources-release-optimize.ap_"
     )
     val optimized = File("${zip}.opt")
     val cmd = exec {
@@ -153,8 +146,6 @@ val optimizeReleaseRes = task("optimizeReleaseRes").doLast {
             aapt2, "optimize",
             "--collapse-resource-names",
             "--enable-sparse-encoding",
-            "--shorten-resource-paths",
-            "--resource-path-shortening-map", mapping,
             "-o", optimized,
             zip
         )
@@ -167,7 +158,7 @@ val optimizeReleaseRes = task("optimizeReleaseRes").doLast {
 }
 
 tasks.whenTaskAdded {
-    if (name == "shrinkReleaseRes") {
+    if (name == "optimizeReleaseResources") {
         finalizedBy(optimizeReleaseRes)
     }
 }
diff --git a/gradle.properties b/gradle.properties
index b9d39fa4..c733747b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,5 +11,3 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 android.useAndroidX=true
-android.enableResourceOptimizations=false
-android.injected.testOnly=false