diff --git a/config/device/all.yml b/config/device/all.yml
index 4f9c723..5f1a627 100644
--- a/config/device/all.yml
+++ b/config/device/all.yml
@@ -1,17 +1,7 @@
 type: device-list
 
-devices:
-  - felix.yml
-  - tangorpro.yml
-  - lynx.yml
-  - cheetah.yml
-  - panther.yml
-  - bluejay.yml
-  - raven.yml
-  - oriole.yml
-  - barbet.yml
-  - redfin.yml
-  - bramble.yml
-  - sunfish.yml
-  - coral.yml
-  - flame.yml
+includes:
+  - pixel-gen7.yml
+  - pixel-gen6.yml
+  - pixel-gen5.yml
+  - pixel-gen4.yml
diff --git a/config/device/pixel-gen4.yml b/config/device/pixel-gen4.yml
new file mode 100644
index 0000000..43ec6b2
--- /dev/null
+++ b/config/device/pixel-gen4.yml
@@ -0,0 +1,6 @@
+type: device-list
+
+devices:
+  - sunfish.yml
+  - coral.yml
+  - flame.yml
diff --git a/config/device/pixel-gen5.yml b/config/device/pixel-gen5.yml
new file mode 100644
index 0000000..16fdb5f
--- /dev/null
+++ b/config/device/pixel-gen5.yml
@@ -0,0 +1,6 @@
+type: device-list
+
+devices:
+  - barbet.yml
+  - redfin.yml
+  - bramble.yml
diff --git a/config/device/pixel-gen6.yml b/config/device/pixel-gen6.yml
new file mode 100644
index 0000000..dfde959
--- /dev/null
+++ b/config/device/pixel-gen6.yml
@@ -0,0 +1,6 @@
+type: device-list
+
+devices:
+  - bluejay.yml
+  - raven.yml
+  - oriole.yml
diff --git a/config/device/pixel-gen7.yml b/config/device/pixel-gen7.yml
new file mode 100644
index 0000000..23c0a2c
--- /dev/null
+++ b/config/device/pixel-gen7.yml
@@ -0,0 +1,8 @@
+type: device-list
+
+devices:
+  - felix.yml
+  - tangorpro.yml
+  - lynx.yml
+  - cheetah.yml
+  - panther.yml