diff --git a/manifest.xml b/manifest.xml
index 583276a..bebb25c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -38,6 +38,15 @@
             <name>IDrmFactory</name>
             <instance>default</instance>
         </interface>
+    </hal>
+	 <hal format="hidl">
+        <name>android.hardware.gatekeeper</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IGatekeeper</name>
+            <instance>default</instance>
+        </interface>
     </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.allocator</name>
diff --git a/redroid_arm64.mk b/redroid_arm64.mk
index e8c9423..fbe8606 100644
--- a/redroid_arm64.mk
+++ b/redroid_arm64.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/treble_common_64.mk)
 
 $(call inherit-product, $(LOCAL_PATH)/redroid.mk)
 $(call inherit-product, $(LOCAL_PATH)/redroid_arm64/device.mk)
diff --git a/redroid_arm64/BoardConfig.mk b/redroid_arm64/BoardConfig.mk
index 24f609d..98f05f3 100644
--- a/redroid_arm64/BoardConfig.mk
+++ b/redroid_arm64/BoardConfig.mk
@@ -1,15 +1,4 @@
-include device/generic/arm64/BoardConfig.mk
-
-TARGET_USES_HWC2 := true
-
-# want all fonts
-SMALLER_FONT_FOOTPRINT := false
-MINIMAL_FONT_FOOTPRINT := false
-
-# use seperate vendor partition
-TARGET_COPY_OUT_VENDOR := vendor
-
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
+include build/make/target/board/generic_arm64_ab/BoardConfig.mk
 
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
@@ -17,7 +6,4 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 536870912
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 
 DEVICE_MANIFEST_FILE += device/redroid/manifest.xml
-PRODUCT_ENFORCE_VINTF_MANIFEST := true
 
-# ~ 1.3G
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1388314624
diff --git a/redroid_x86_64.mk b/redroid_x86_64.mk
index e2843b7..9f0f81c 100644
--- a/redroid_x86_64.mk
+++ b/redroid_x86_64.mk
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/treble_common_64.mk)
 
 $(call inherit-product, $(LOCAL_PATH)/redroid.mk)
 $(call inherit-product, $(LOCAL_PATH)/redroid_x86_64/device.mk)
diff --git a/redroid_x86_64/BoardConfig.mk b/redroid_x86_64/BoardConfig.mk
index 4058db2..4f9b0a1 100755
--- a/redroid_x86_64/BoardConfig.mk
+++ b/redroid_x86_64/BoardConfig.mk
@@ -1,21 +1,9 @@
-include device/generic/x86_64/BoardConfig.mk
-
-TARGET_USES_HWC2 := true
-
-# want all fonts
-SMALLER_FONT_FOOTPRINT := false
-MINIMAL_FONT_FOOTPRINT := false
-
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
+include build/make/target/board/generic_x86_64_ab/BoardConfig.mk
 
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
 BOARD_VENDORIMAGE_PARTITION_SIZE := 536870912
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 
-# use seperate vendor partition
-TARGET_COPY_OUT_VENDOR := vendor
-
 DEVICE_MANIFEST_FILE += device/redroid/manifest.xml
-PRODUCT_ENFORCE_VINTF_MANIFEST := true