diff --git a/hwModules/common/gpu/amd/default.nix b/hwModules/common/gpu/amd/default.nix
index a3d3cc3f..0e9baf52 100644
--- a/hwModules/common/gpu/amd/default.nix
+++ b/hwModules/common/gpu/amd/default.nix
@@ -1,14 +1,18 @@
 {...}: {
   environment.variables.VDPAU_DRIVER = "radeonsi";
 
-  hardware.amdgpu = {
-    initrd.enable = true;
+  hardware = {
+    amdgpu = {
+      initrd.enable = true;
 
-    amdvlk = {
-      enable = true;
-      support32Bit.enable = true;
+      amdvlk = {
+        enable = true;
+        support32Bit.enable = true;
+      };
+
+      opencl.enable = true;
     };
 
-    opencl.enable = true;
+    graphics.enable = true;
   };
 }
diff --git a/hwModules/common/gpu/intel/default.nix b/hwModules/common/gpu/intel/default.nix
index b4fca248..8819e2e0 100644
--- a/hwModules/common/gpu/intel/default.nix
+++ b/hwModules/common/gpu/intel/default.nix
@@ -9,7 +9,7 @@
   hardware = {
     intel-gpu-tools.enable = true;
 
-    opengl = {
+    graphics = {
       enable = true;
 
       extraPackages = [