diff --git a/BoardConfig.mk b/BoardConfig.mk
index cd3301a..3409a34 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,15 +1,18 @@
 DEVICE_PATH := device/samsung/a20
 
+# Inherit common board flags
+include device/samsung/exynos7885-common/BoardConfigCommon.mk
+
 # Asserts
 TARGET_OTA_ASSERT_DEVICE := a20,a20dd
 
+# Display
+TARGET_SCREEN_DENSITY := 280
+
 # Kernel
 TARGET_KERNEL_CONFIG := exynos7885_defconfig
 TARGET_KERNEL_CONFIG += a20.config
 
-# Display
-TARGET_SCREEN_DENSITY := 280
-
 # Partitions
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 55574528 # 55MB
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4303355904
@@ -19,9 +22,6 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 452984832
 # Properties
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 
-# Inherit common board flags
-include device/samsung/exynos7885-common/BoardConfigCommon.mk
-
 # SPL
 VENDOR_SECURITY_PATCH := 2021-06-01
 
diff --git a/device.mk b/device.mk
index 4cad3e5..eef666a 100644
--- a/device.mk
+++ b/device.mk
@@ -1,10 +1,6 @@
 # Copyright (C) 2025 The LineageOS Project
 # SPDX-License-Identifier: Apache-2.0
 
-# Target Info
-TARGET_SOC := exynos7884B
-TARGET_DEVICE := a20
-
 # Inherit common device configuration
 $(call inherit-product, device/samsung/exynos7885-common/exynos7885-common.mk)
 
@@ -14,7 +10,11 @@ $(call inherit-product, vendor/samsung/a20/a20-vendor.mk)
 # Inherit dalvik config
 $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
 
-# Display resolution
+# Target Info
+TARGET_DEVICE := a20
+TARGET_SOC := exynos7884B
+
+# Bootanimation
 TARGET_SCREEN_HEIGHT := 1560
 TARGET_SCREEN_WIDTH := 720
 
@@ -25,8 +25,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
 
-# Soong namespaces
-PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH)
-
 # Overlay
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
+
+# Soong namespaces
+PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH)
diff --git a/lineage_a20.mk b/lineage_a20.mk
index 5b7a04e..0c86074 100644
--- a/lineage_a20.mk
+++ b/lineage_a20.mk
@@ -7,12 +7,12 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)
 
-# Inherit device configuration
-$(call inherit-product, device/samsung/a20/device.mk)
-
 # Inherit LineageOS common device config
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
+# Inherit device configuration
+$(call inherit-product, device/samsung/a20/device.mk)
+
 # Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := a20
 PRODUCT_NAME := lineage_a20