diff --git a/BoardConfig.mk b/BoardConfig.mk
index 36b5e6f..5e93e58 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -20,6 +20,11 @@ TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_VARIANT := generic
 TARGET_CPU_VARIANT_RUNTIME := kryo300
 
+# Enable 64-bit for non-zygote.
+ZYGOTE_FORCE_64 := true
+# Force any prefer32 targets to be compiled as 64 bit.
+IGNORE_PREFER32_ON_DEVICE := true
+
 # Assert
 TARGET_OTA_ASSERT_DEVICE := e1q
 
diff --git a/lineage_e1q.mk b/lineage_e1q.mk
index 3744bc0..ae72f92 100644
--- a/lineage_e1q.mk
+++ b/lineage_e1q.mk
@@ -5,7 +5,7 @@
 #
 
 # Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 # Inherit some common Lineage stuff.