diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index e34bfb90..5097ffbd 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -84,7 +84,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: mappings
-        path: "core/build/outputs/mapping"
+        path: "core/build/outputs/mapping/release"
     - name: Post to channel
       if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/master' }}
       env:
diff --git a/.github/workflows/manager.yml b/.github/workflows/manager.yml
index 124ab16a..2489dbac 100644
--- a/.github/workflows/manager.yml
+++ b/.github/workflows/manager.yml
@@ -63,8 +63,8 @@ jobs:
       - name: Upload mappings
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ steps.buildRelease.outputs.releaseName }}-mappings
-          path: "app/build/outputs"
+          name: mappings
+          path: "app/build/outputs/mapping/release"
       - name: Post to channel
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
         env:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7fcec57a..a846a79d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -123,22 +123,29 @@ val optimizeReleaseRes = task("optimizeReleaseRes").doLast {
         project.android.buildToolsVersion,
         "aapt2"
     )
+    val mapping = Paths.get(
+        project.buildDir.path,
+        "outputs",
+        "mapping",
+        "release",
+        "shortening.txt"
+    )
     val zip = Paths.get(
         project.buildDir.path,
         "intermediates",
-        "optimized_processed_res",
+        "shrunk_processed_res",
         "release",
-        "resources-release-optimize.ap_"
+        "resources-release-stripped.ap_"
     )
     val optimized = File("${zip}.opt")
     val cmd = exec {
         commandLine(
-            aapt2,
-            "optimize",
+            aapt2, "optimize",
             "--collapse-resource-names",
             "--enable-sparse-encoding",
-            "-o",
-            optimized,
+            "--shorten-resource-paths",
+            "--resource-path-shortening-map", mapping,
+            "-o", optimized,
             zip
         )
         isIgnoreExitValue = false
@@ -150,7 +157,7 @@ val optimizeReleaseRes = task("optimizeReleaseRes").doLast {
 }
 
 tasks.whenTaskAdded {
-    if (name == "optimizeReleaseResources") {
+    if (name == "shrinkReleaseRes") {
         finalizedBy(optimizeReleaseRes)
     }
 }
diff --git a/gradle.properties b/gradle.properties
index ab664ace..28382bcd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,3 +13,4 @@
 #Sat Jan 30 19:20:27 CST 202130.0.322.0.7026061
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableResourceOptimizations=false