diff --git a/config/barbet.yml b/config/barbet.yml
new file mode 100644
index 0000000..612d1c7
--- /dev/null
+++ b/config/barbet.yml
@@ -0,0 +1,8 @@
+device:
+  name: barbet
+
+platform:
+  product_makefile: device/google/barbet/aosp_barbet.mk
+
+includes:
+  - common/gen5pixel.yml
diff --git a/config/common/gen4.5pixel.yml b/config/common/gen4.5pixel.yml
new file mode 100644
index 0000000..9b2aed2
--- /dev/null
+++ b/config/common/gen4.5pixel.yml
@@ -0,0 +1,6 @@
+platform:
+  sepolicy_dirs:
+    - device/google/sunfish-sepolicy
+
+includes:
+  - pixel.yml
diff --git a/config/common/gen4pixel.yml b/config/common/gen4pixel.yml
index ffeaa9f..394f957 100644
--- a/config/common/gen4pixel.yml
+++ b/config/common/gen4pixel.yml
@@ -1,13 +1,6 @@
+platform:
+  sepolicy_dirs:
+    - device/google/coral-sepolicy
+
 includes:
   - pixel.yml
-
-filters:
-  dep_files:
-    match:
-      # Required by libOmxSwVencMpeg4
-      - vendor/lib/libMpeg4SwEncoder.so
-      - vendor/lib64/libMpeg4SwEncoder.so
-
-      # Required by chre
-      - vendor/lib/libsdsprpc.so
-      - vendor/lib64/libsdsprpc.so
diff --git a/config/common/gen5pixel.yml b/config/common/gen5pixel.yml
index e65a173..ee61785 100644
--- a/config/common/gen5pixel.yml
+++ b/config/common/gen5pixel.yml
@@ -4,33 +4,3 @@ platform:
 
 includes:
   - pixel.yml
-
-filters:
-  dep_files:
-    match:
-      # Required by libOmxSwVencMpeg4
-      - vendor/lib/libMpeg4SwEncoder.so
-      - vendor/lib64/libMpeg4SwEncoder.so
-
-      # Required by vendor.qti.hardware.display.composer-service
-      - vendor/lib64/libthermalclient.so
-
-      # Required by chre
-      - vendor/lib/libadsprpc.so
-      - vendor/lib64/libadsprpc.so
-
-      # Required by libOmxVenc
-      - vendor/lib/libfastcvopt.so
-      - vendor/lib64/libfastcvopt.so
-
-      # Needed to pass checkvintf
-      - vendor/etc/vintf/manifest/android.hardware.graphics.mapper-impl-qti-display.xml
-      - vendor/etc/vintf/manifest/c2_manifest_vendor.xml
-      - vendor/etc/vintf/manifest/pixel-display-default.xml
-      - vendor/etc/vintf/manifest/vendor.qti.hardware.display.allocator-service.xml
-      - vendor/etc/vintf/manifest/vendor.qti.hardware.display.composer-service.xml
-
-  overlay_files:
-    match:
-      # Workaround for aapt2 output parsing bug
-      - HbmSVManager__auto_generated_rro_vendor.apk
diff --git a/config/common/gen6pixel.yml b/config/common/gen6pixel.yml
index 4438d2e..15177df 100644
--- a/config/common/gen6pixel.yml
+++ b/config/common/gen6pixel.yml
@@ -4,40 +4,3 @@ platform:
 
 includes:
   - pixel.yml
-
-filters:
-  dep_files:
-    match:
-      # Required for building ARM NN HAL
-      - vendor/lib/libOpenCL.so
-      - vendor/lib64/libOpenCL.so
-  files:
-    match:
-      - product/etc/permissions/com.android.sdm.plugins.connmo.xml
-      - product/etc/permissions/com.android.sdm.plugins.dcmo.xml
-      - product/etc/permissions/com.android.sdm.plugins.diagmon.xml
-      - product/etc/permissions/com.google.android.apps.dreamliner.xml
-      - product/etc/permissions/com.google.android.odad.xml
-      - product/etc/permissions/privapp-permissions-google-p.xml
-      - product/etc/permissions/split-permissions-google.xml
-      - product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
-      - product/etc/sysconfig/google-staged-installer-whitelist.xml
-      - product/etc/sysconfig/google.xml
-      - product/etc/sysconfig/GoogleCamera_6gb_or_more_ram.xml
-      - product/etc/sysconfig/nexus.xml
-      - product/etc/sysconfig/pixel_experience_2017.xml
-      - product/etc/sysconfig/pixel_experience_2018.xml
-      - product/etc/sysconfig/pixel_experience_2019_midyear.xml
-      - product/etc/sysconfig/pixel_experience_2019.xml
-      - product/etc/sysconfig/pixel_experience_2020_midyear.xml
-      - product/etc/sysconfig/pixel_experience_2020.xml
-      - product/etc/sysconfig/pixel_experience_2021_midyear.xml
-      - product/etc/sysconfig/pixel_experience_2021.xml
-      - product/etc/sysconfig/nga.xml
-      - product/etc/sysconfig/google_build.xml
-      - product/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
-      - system_ext/etc/permissions/privapp-permissions-google-se.xml
-      - vendor/etc/fstab.gs101-fips
-      # UCI
-      - vendor/bin/uci_daemon
-      - vendor/etc/init/usb-cdc.rc
diff --git a/config/coral.yml b/config/coral.yml
index f919c1f..1e4d18c 100644
--- a/config/coral.yml
+++ b/config/coral.yml
@@ -3,8 +3,6 @@ device:
 
 platform:
   product_makefile: device/google/coral/aosp_coral.mk
-  sepolicy_dirs:
-    - device/google/coral-sepolicy
 
 includes:
   - common/gen4pixel.yml
diff --git a/config/flame.yml b/config/flame.yml
index 2fa1804..0301ffa 100644
--- a/config/flame.yml
+++ b/config/flame.yml
@@ -3,8 +3,6 @@ device:
 
 platform:
   product_makefile: device/google/coral/aosp_flame.mk
-  sepolicy_dirs:
-    - device/google/coral-sepolicy
 
 includes:
   - common/gen4pixel.yml
diff --git a/config/oriole.yml b/config/oriole.yml
index 3fddd3c..1e03df6 100644
--- a/config/oriole.yml
+++ b/config/oriole.yml
@@ -6,9 +6,3 @@ platform:
 
 includes:
   - common/gen6pixel.yml
-
-filters:
-  overlay_files:
-    match:
-      # Workaround for aapt2 output parsing bug
-      - HbmSVManager__auto_generated_rro_product.apk
diff --git a/config/sunfish.yml b/config/sunfish.yml
index 311109b..00b1f30 100644
--- a/config/sunfish.yml
+++ b/config/sunfish.yml
@@ -3,8 +3,6 @@ device:
 
 platform:
   product_makefile: device/google/sunfish/aosp_sunfish.mk
-  sepolicy_dirs:
-    - device/google/sunfish-sepolicy
 
 includes:
-  - common/gen4pixel.yml
+  - common/gen4.5pixel.yml