diff --git a/BoardConfig.mk b/BoardConfig.mk
index 925c0d4..a0f1d64 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+# Inherit from motorola sm8250-common
+$(call inherit-product, device/motorola/sm8250-common/BoardConfigCommon.mk)
 
 # Partitions
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 226517168128
@@ -25,3 +27,7 @@ BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 993096064
 endif
 BOARD_MOT_DP_SIZE := 7109345280
 BOARD_SUPER_PARTITION_SIZE := 14227079168
+
+
+# inherit from the proprietary version
+$(call inherit-product,  vendor/motorola/pstar/BoardConfigVendor.mk)
diff --git a/device.mk b/device.mk
index 340b1f0..3b6190a 100644
--- a/device.mk
+++ b/device.mk
@@ -18,4 +18,12 @@
 TARGET_SCREEN_HEIGHT := 2400
 TARGET_SCREEN_WIDTH := 1080
 
-PRODUCT_SHIPPING_API_LEVEL := 30
\ No newline at end of file
+PRODUCT_SHIPPING_API_LEVEL := 30
+
+# Inherit from motorola sm8250-common
+$(call inherit-product, device/motorola/sm8250-common/common.mk)
+
+
+
+# Inherit from vendor blobs
+$(call inherit-product, vendor/motorola/pstar/pstar-vendor.mk)