diff --git a/auto/manifest.xml b/auto/manifest.xml
index 660b03d..18aa3bd 100644
--- a/auto/manifest.xml
+++ b/auto/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device">
+<manifest version="1.0" type="device" target-level="2">
     <hal format="hidl">
         <name>android.hardware.automotive.vehicle</name>
         <transport>hwbinder</transport>
diff --git a/beagle_x15.mk b/beagle_x15.mk
index a3b3f50..3ac5e93 100644
--- a/beagle_x15.mk
+++ b/beagle_x15.mk
@@ -17,8 +17,6 @@
 $(call inherit-product, device/ti/beagle_x15/device.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 
-PRODUCT_SHIPPING_API_LEVEL := 29
-PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
 PRODUCT_NAME := beagle_x15
 PRODUCT_DEVICE := beagle_x15
 PRODUCT_BRAND := Android
diff --git a/device.mk b/device.mk
index 2951b81..ee50951 100644
--- a/device.mk
+++ b/device.mk
@@ -26,6 +26,9 @@
 # Adjust the dalvik heap to be appropriate for a tablet.
 $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk)
 
+PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
+
 # Set custom settings
 DEVICE_PACKAGE_OVERLAYS := device/ti/beagle_x15/overlay
 PREBUILT_DIR := device/ti/beagle_x15-kernel