diff --git a/BoardConfig.mk b/BoardConfig.mk
index e65d3f122547e1bf3ff2d4d095d3cbff4910840d..ac4a7b12a0ad7dea2a50a0433dbf694af2c71a9a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -24,9 +24,6 @@ BUILD_BROKEN_DUP_RULES := true
 
 ENABLE_CPUSETS := true
 
-# Apps
-TARGET_SUPPORTS_64_BIT_APPS := true
-
 # Audio
 USE_XML_AUDIO_POLICY_CONF := 1
 
@@ -43,9 +40,6 @@ ENABLE_VENDOR_RIL_SERVICE := true
 # Platform
 TARGET_BOARD_PLATFORM := mt6765
 
-# Assert
-TARGET_OTA_ASSERT_DEVICE := yk673v6_lwg62_64,2e,Teracube_2e
-
 # Charger Mode
 BOARD_CHARGER_ENABLE_SUSPEND := true
 
diff --git a/lineage.dependencies b/lineage.dependencies
new file mode 100644
index 0000000000000000000000000000000000000000..5eb5951be419774fd68fff532d06357f1e3013ee
--- /dev/null
+++ b/lineage.dependencies
@@ -0,0 +1,10 @@
+[
+  {
+    "repository": "android_kernel_teracube_2e",
+    "target_path": "kernel/teracube/2e"
+  },
+  {
+    "repository" : "android_device_mediatek_sepolicy",
+    "target_path": "device/mediatek/sepolicy"
+  }
+]
diff --git a/lineage_2e.mk b/lineage_2e.mk
index 7e81db8ea04a672552e23beb1a23d3763421d478..468a9f26abf0cfad02dd030c651677024b60723f 100644
--- a/lineage_2e.mk
+++ b/lineage_2e.mk
@@ -1,29 +1,34 @@
 #
 # Copyright (C) 2021 Teracube Inc.
+# Copyright 2022 - E FOUNDATION
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit from 2e device
-$(call inherit-product, device/teracube/2e/device.mk)
-
 # 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/full_base_telephony.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
 
 # Inherit some common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
+# Inherit from 2e device
+$(call inherit-product, device/teracube/2e/device.mk)
+
+# Assert
+TARGET_OTA_ASSERT_DEVICE := yk673v6_lwg62_64,2e,Teracube_2e
+
 PRODUCT_DEVICE := 2e
 PRODUCT_MANUFACTURER := Teracube
 PRODUCT_NAME := lineage_2e
-PRODUCT_MODEL := Teracube 2e
+PRODUCT_BRAND := Teracube
+PRODUCT_MODEL := Teracube_2e
 
 PRODUCT_GMS_CLIENTID_BASE := android-teracube
-TARGET_VENDOR := teracube
-TARGET_VENDOR_PRODUCT_NAME := 2e
-PRODUCT_BUILD_PROP_OVERRIDES += PRIVATE_BUILD_DESC="full_yk673v6_lwg62_64-user 10 QP1A.190711.020 p1k61v164bspP29 release-keys"
 
-# Set BUILD_FINGERPRINT variable to be picked up by both system and vendor build.prop
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    PRODUCT_DEVICE=Teracube_2e \
+    PRODUCT_NAME=Teracube_2e \
+    PRIVATE_BUILD_DESC="full_yk673v6_lwg62_64-user 10 QP1A.190711.020 p1k61v164bspP29 release-keys"
+
 BUILD_FINGERPRINT := Teracube/Teracube_2e/Teracube_2e:10/QP1A.190711.020/202011161116:user/release-keys