diff --git a/common/cpu/intel/coffee-lake/cpu-only.nix b/common/cpu/intel/coffee-lake/cpu-only.nix
new file mode 100644
index 000000000..82892615d
--- /dev/null
+++ b/common/cpu/intel/coffee-lake/cpu-only.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../cpu-only.nix
+  ];
+}
diff --git a/common/cpu/intel/coffee-lake/default.nix b/common/cpu/intel/coffee-lake/default.nix
new file mode 100644
index 000000000..0d02b9c91
--- /dev/null
+++ b/common/cpu/intel/coffee-lake/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./cpu-only.nix
+    ../../../gpu/intel/coffee-lake
+  ];
+}
diff --git a/common/gpu/intel/coffee-lake/default.nix b/common/gpu/intel/coffee-lake/default.nix
new file mode 100644
index 000000000..55e71d219
--- /dev/null
+++ b/common/gpu/intel/coffee-lake/default.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  imports = [ ../. ];
+
+  boot.kernelParams = [
+    "i915.enable_guc=2"
+  ];
+
+  hardware.intelgpu.vaapiDriver = "intel-media-driver";
+}