Also disable app optimization
diff --git a/gapps.mk b/gapps.mk
index 6697b81..9dc4e06 100644
--- a/gapps.mk
+++ b/gapps.mk
@@ -1,5 +1,6 @@
 GAPPS_VARIANT := nano
 DONT_DEXPREOPT_PREBUILTS := true
+WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true
 GAPPS_FORCE_PACKAGE_OVERRIDES := true
 GAPPS_FORCE_BROWSER_OVERRIDES := true
 GAPPS_FORCE_WEBVIEW_OVERRIDES := true