diff --git a/BoardConfig.mk b/BoardConfig.mk
index 824013c..2fefd7f 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -47,16 +47,12 @@
 TARGET_NO_BOOTLOADER := true
 
 # A/B
-AB_OTA_UPDATER := true
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2
 
 # ANT+
 BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
 
-# Api
-#PRODUCT_SHIPPING_API_LEVEL := 28
-
 # APEX
 DEXPREOPT_GENERATE_APEX_IMAGE := true
 
@@ -154,9 +150,6 @@
 TARGET_BOARD_PLATFORM := msmnile
 TARGET_BOARD_PLATFORM_GPU := qcom-adreno640
 
-# Properties
-BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
-
 # Recovery
 BOARD_USES_RECOVERY_AS_BOOT := true
 TARGET_NO_RECOVERY := true
diff --git a/device.mk b/device.mk
index 4ff65f9..d313e3f 100755
--- a/device.mk
+++ b/device.mk
@@ -35,6 +35,8 @@
     $(LOCAL_PATH)/overlay
 
 # A/B
+AB_OTA_UPDATER := true
+
 AB_OTA_PARTITIONS += \
     boot \
     dtbo \
@@ -51,6 +53,9 @@
 PRODUCT_PACKAGES += \
     AntHalService
 
+# Api
+PRODUCT_SHIPPING_API_LEVEL := 28
+
 # audio
 PRODUCT_PACKAGES += \
     audio.a2dp.default
@@ -143,6 +148,9 @@
 PRODUCT_AAPT_CONFIG := xxhdpi
 PRODUCT_AAPT_PREF_CONFIG := xxhdpi
 
+# Properties
+BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
+
 # Rootdir
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/recovery.fstab:system/etc/fstab.qcom