diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bc3732168e3f..59573848d528 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -128,9 +128,6 @@ android {
 
         buildTypes {
             release {
-                optimization {
-                    enable = true
-                }
                 buildConfigField("String", "NC_TEST_SERVER_DATA_STRING", "\"\"")
                 ndk {
                     abiFilters += allAbis
@@ -140,6 +137,9 @@ android {
                 enableUnitTestCoverage = project.hasProperty("coverage")
                 enableAndroidTestCoverage = project.hasProperty("coverage")
                 resConfigs("xxxhdpi")
+                optimization {
+                    enable = true
+                }
                 ndk {
                     abiFilters += if (ciBuild) allAbis else localDebugAbis
                 }
@@ -168,6 +168,9 @@ android {
                 dimension = "default"
                 versionCode = 20220322
                 versionName = "20220322"
+                optimization {
+                    enable = true
+                }
             }
 
             register("qa") {
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 4e757647d078..971d71dff2c2 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -29,13 +29,6 @@ GRADLE_SIGNING_PROPERTIES = {
 import("./common.Fastfile")
 
 platform :android do
-
-    before_all do
-        gradleFile = "../app/build.gradle.kts"
-        content = File.read(gradleFile)
-        File.write(gradleFile, content.sub(/(optimization\s*\{\s*enable\s*=\s*)true/, '\\1false'))
-    end
-
     ## private lanes
     desc "check if library is set correctly"
     private_lane :checkLibrary do |options|