diff --git a/redroid.mk b/redroid.mk
index 0e465f1..8f9d6c3 100644
--- a/redroid.mk
+++ b/redroid.mk
@@ -59,13 +59,6 @@ PRODUCT_PACKAGES += \
     libGLESv1_CM_swiftshader \
     libGLESv2_swiftshader \
     vulkan.pastel \
-    libEGL_mesa \
-    libGLESv1_CM_mesa \
-    libGLESv2_mesa \
-    libgallium_dri \
-    libglapi \
-    vulkan.radeon \
-    vulkan.virtio \
     ipconfigstore \
 
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -141,3 +134,4 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
 
 $(call inherit-product-if-exists, product.mk)
 
+$(call inherit-product, device/redroid-prebuilts/prebuilts.mk)
diff --git a/redroid_arm64/BoardConfig.mk b/redroid_arm64/BoardConfig.mk
index 9a5187d..ae737d3 100644
--- a/redroid_arm64/BoardConfig.mk
+++ b/redroid_arm64/BoardConfig.mk
@@ -1,16 +1,4 @@
-# arm64 emulator specific definitions
-TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_VARIANT := generic
-TARGET_CPU_ABI := arm64-v8a
-
-TARGET_2ND_ARCH := arm
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_ARCH_VARIANT := armv7-a-neon
-TARGET_2ND_CPU_VARIANT := generic
-
-include build/make/target/board/BoardConfigGsiCommon.mk
+include build/make/target/board/generic_arm64_ab/BoardConfig.mk
 
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
@@ -18,9 +6,5 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 16777216
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 16777216
 
-BOARD_MESA3D_USES_MESON_BUILD := true
-BOARD_MESA3D_GALLIUM_DRIVERS := virgl radeonsi v3d vc4 freedreno panfrost
-BOARD_MESA3D_VULKAN_DRIVERS := virtio-experimental amd broadcom freedreno panfrost
-
 DEVICE_MANIFEST_FILE += device/redroid/manifest.xml
 
diff --git a/redroid_arm64/device.mk b/redroid_arm64/device.mk
index aacfc82..aac7ddb 100644
--- a/redroid_arm64/device.mk
+++ b/redroid_arm64/device.mk
@@ -1,5 +1,4 @@
-PRODUCT_PACKAGES += \
-    vulkan.broadcom \
-    vulkan.freedreno \
-    vulkan.panfrost \
+PRODUCT_COPY_FILES += \
+    device/redroid/mediacodec.policy.arm:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
 
+$(call inherit-product, device/redroid-prebuilts/prebuilts_arm.mk)
diff --git a/redroid_x86_64/BoardConfig.mk b/redroid_x86_64/BoardConfig.mk
index 16f31c2..1fe7961 100755
--- a/redroid_x86_64/BoardConfig.mk
+++ b/redroid_x86_64/BoardConfig.mk
@@ -1,12 +1,4 @@
-TARGET_CPU_ABI := x86_64
-TARGET_ARCH := x86_64
-TARGET_ARCH_VARIANT := x86_64
-
-TARGET_2ND_CPU_ABI := x86
-TARGET_2ND_ARCH := x86
-TARGET_2ND_ARCH_VARIANT := x86_64
-
-include build/make/target/board/BoardConfigGsiCommon.mk
+include build/make/target/board/generic_x86_64_ab/BoardConfig.mk
 
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
@@ -14,9 +6,5 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 16777216
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 16777216
 
-BOARD_MESA3D_USES_MESON_BUILD := true
-BOARD_MESA3D_GALLIUM_DRIVERS := virgl radeonsi i915 iris crocus
-BOARD_MESA3D_VULKAN_DRIVERS := virtio-experimental amd intel
-
 DEVICE_MANIFEST_FILE += device/redroid/manifest.xml
 
diff --git a/redroid_x86_64/device.mk b/redroid_x86_64/device.mk
index e967bb8..4eb8dca 100644
--- a/redroid_x86_64/device.mk
+++ b/redroid_x86_64/device.mk
@@ -1,3 +1,4 @@
-PRODUCT_PACKAGES += \
-    vulkan.intel \
+PRODUCT_COPY_FILES += \
+    device/redroid/mediacodec.policy.x86:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
 
+$(call inherit-product, device/redroid-prebuilts/prebuilts_x86.mk)