diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index b7a28e90..e1fd1f0a 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -40,9 +40,6 @@ endif
 # ANT+
 BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
 
-# APEX image
-DEXPREOPT_GENERATE_APEX_IMAGE := true
-
 # Architecture
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 0ee40296..a5ef5b55 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -895,8 +895,6 @@
       <item>"/system/framework/framework.jar"</item>
       <item>"/system/framework/oat/arm64/services.odex"</item>
       <item>"/system/framework/services.jar"</item>
-      <item>"/system/framework/arm64/boot.oat"</item>
-      <item>"/system/framework/arm64/boot-core-libart.oat"</item>
       <item>"/apex/com.android.runtime/javalib/core-oj.jar"</item>
       <item>"/apex/com.android.runtime/javalib/core-libart.jar"</item>
       <item>"/apex/com.android.media/javalib/updatable-media.jar"</item>
@@ -912,12 +910,10 @@
       <item>"/system/lib64/libsurfaceflinger.so"</item>
    </string-array>
 
-    <!-- List of files pinned by the Pinner Service with the apex boot image b/119800099 -->
-    <string-array translatable="false" name="config_apexBootImagePinnerServiceFiles">
+    <!-- List of files pinned by the Pinner Service with the JIT Zygote boot image -->
+    <string-array translatable="false" name="config_jitzygoteBootImagePinnerServiceFiles">
       <item>"/system/framework/framework.jar"</item>
       <item>"/system/framework/services.jar"</item>
-      <item>"/system/framework/arm64/apex.oat"</item>
-      <item>"/system/framework/arm64/apex-core-libart.oat"</item>
       <item>"/apex/com.android.runtime/javalib/core-oj.jar"</item>
       <item>"/apex/com.android.runtime/javalib/core-libart.jar"</item>
       <item>"/apex/com.android.media/javalib/updatable-media.jar"</item>