diff --git a/system/shared/hardware/gpu/amd.nix b/system/shared/hardware/gpu/amd.nix
index a65b5cf..146330a 100644
--- a/system/shared/hardware/gpu/amd.nix
+++ b/system/shared/hardware/gpu/amd.nix
@@ -23,16 +23,12 @@ in
     ];
 
     # Enable OpenGL
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
 
       # Enable OpenCL and AMDVLK
-      extraPackages = with pkgs; [
-        amdvlk
-      ];
-      extraPackages32 = with pkgs; [
-        driversi686Linux.amdvlk
-      ];
+      extraPackages = with pkgs; [ amdvlk ];
+      extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
     };
   };
 }
diff --git a/system/shared/hardware/gpu/nvidia.nix b/system/shared/hardware/gpu/nvidia.nix
index 5679760..8480875 100644
--- a/system/shared/hardware/gpu/nvidia.nix
+++ b/system/shared/hardware/gpu/nvidia.nix
@@ -63,7 +63,7 @@ in
       };
 
       # Enable OpenGL
-      opengl = {
+      graphics = {
         enable = true;
 
         # VA-API implementation using NVIDIA's NVDEC