diff --git a/config/redbear-device-services.toml b/config/redbear-device-services.toml
index c9d2002a..642706fb 100644
--- a/config/redbear-device-services.toml
+++ b/config/redbear-device-services.toml
@@ -12,6 +12,44 @@ data = ""
 directory = true
 mode = 0o755
 
+[[files]]
+path = "/lib/pcid.d/intel_gpu.toml"
+data = """
+# PCID configuration for Intel GPU auto-detection
+[[drivers]]
+name = "Intel GPU (VGA compatible)"
+class = 0x03
+vendor = 0x8086
+subclass = 0x00
+command = ["redox-drm"]
+
+[[drivers]]
+name = "Intel GPU (3D controller)"
+class = 0x03
+vendor = 0x8086
+subclass = 0x02
+command = ["redox-drm"]
+"""
+
+[[files]]
+path = "/lib/pcid.d/amd_gpu.toml"
+data = """
+# PCID configuration for AMD GPU auto-detection
+[[drivers]]
+name = "AMD GPU (VGA compatible)"
+class = 0x03
+vendor = 0x1002
+subclass = 0x00
+command = ["redox-drm"]
+
+[[drivers]]
+name = "AMD GPU (3D controller)"
+class = 0x03
+vendor = 0x1002
+subclass = 0x02
+command = ["redox-drm"]
+"""
+
 [[files]]
 path = "/usr/lib/init.d/05_firmware-loader.service"
 data = """
diff --git a/local/config/pcid.d/amd_gpu.toml b/local/config/pcid.d/amd_gpu.toml
index ee3ea1a4..ec2cf4f0 100644
--- a/local/config/pcid.d/amd_gpu.toml
+++ b/local/config/pcid.d/amd_gpu.toml
@@ -2,16 +2,16 @@
 # When pcid detects an AMD GPU (vendor 0x1002, class 0x03),
 # it launches redox-drm with the PCI device location.
 
-[[device]]
-vendor = 0x1002
+[[drivers]]
+name = "AMD GPU (VGA compatible)"
 class = 0x03
+vendor = 0x1002
 subclass = 0x00
 command = ["redox-drm"]
-args = ["$BUS", "$DEV", "$FUNC"]
 
-[[device]]
-vendor = 0x1002
+[[drivers]]
+name = "AMD GPU (3D controller)"
 class = 0x03
+vendor = 0x1002
 subclass = 0x02
 command = ["redox-drm"]
-args = ["$BUS", "$DEV", "$FUNC"]
diff --git a/local/config/pcid.d/intel_gpu.toml b/local/config/pcid.d/intel_gpu.toml
index 00e28805..26628d3f 100644
--- a/local/config/pcid.d/intel_gpu.toml
+++ b/local/config/pcid.d/intel_gpu.toml
@@ -2,16 +2,16 @@
 # When pcid detects an Intel GPU (vendor 0x8086, class 0x03),
 # it launches redox-drm with the PCI device location.
 
-[[device]]
-vendor = 0x8086
+[[drivers]]
+name = "Intel GPU (VGA compatible)"
 class = 0x03
+vendor = 0x8086
 subclass = 0x00
 command = ["redox-drm"]
-args = ["$BUS", "$DEV", "$FUNC"]
 
-[[device]]
-vendor = 0x8086
+[[drivers]]
+name = "Intel GPU (3D controller)"
 class = 0x03
+vendor = 0x8086
 subclass = 0x02
 command = ["redox-drm"]
-args = ["$BUS", "$DEV", "$FUNC"]