diff --git a/common/cpu/amd/pstate.nix b/common/cpu/amd/pstate.nix
index 7d5c2c0..ab07a91 100644
--- a/common/cpu/amd/pstate.nix
+++ b/common/cpu/amd/pstate.nix
@@ -1,10 +1,22 @@
-{ lib, config, ... }: {
+{ lib, config, ... }: 
+let
+   kver = config.boot.kernelPackages.kernel.version;
+in
+{
   # Enables the amd cpu scaling https://www.kernel.org/doc/html/latest/admin-guide/pm/amd-pstate.html
   # On recent AMD CPUs this can be more energy efficient.
 
   imports = [ ./. ];
-  boot = lib.mkIf (lib.versionAtLeast config.boot.kernelPackages.kernel.version "5.17") {
-    kernelParams = [ "initcall_blacklist=acpi_cpufreq_init" ];
-    kernelModules = [ "amd-pstate" ];
-  };
+  boot = lib.mkMerge [
+    (lib.mkIf (
+      (lib.versionAtLeast kver "5.17")
+      && (lib.versionOlder kver "6.1")
+    ) {
+      kernelParams = [ "initcall_blacklist=acpi_cpufreq_init" ];
+      kernelModules = [ "amd-pstate" ];
+    })
+    (lib.mkIf (lib.versionAtLeast kver "6.1") {
+      kernelParams = [ "amd_pstate=passive" ];  
+    })
+  ];
 }
diff --git a/common/gpu/amd/default.nix b/common/gpu/amd/default.nix
index 762b3c0..91ba0b7 100644
--- a/common/gpu/amd/default.nix
+++ b/common/gpu/amd/default.nix
@@ -1,23 +1,35 @@
 { config, lib, pkgs, ... }:
 
 {
-  boot.initrd.kernelModules = [ "amdgpu" ];
-  services.xserver.videoDrivers = [ "amdgpu" ];
-  
-  hardware.opengl.extraPackages = with pkgs; [
-    rocm-opencl-icd
-    rocm-opencl-runtime
-    amdvlk
-  ];
-
-  hardware.opengl.extraPackages32 = with pkgs; [
-    driversi686Linux.amdvlk
-  ];
-
-  hardware.opengl = {
-    driSupport = lib.mkDefault true;
-    driSupport32Bit = lib.mkDefault true;
+  options.hardware.amdgpu.loadInInitrd = lib.mkEnableOption (lib.mdDoc 
+    "loading `amdgpu` kernelModule at stage 1. (Add `amdgpu` to `boot.initrd.kernelModules`)"
+  ) // {
+    default = true;
   };
 
-  environment.variables.AMD_VULKAN_ICD = lib.mkDefault "RADV";
+  config = lib.mkMerge [
+    {
+      services.xserver.videoDrivers = lib.mkDefault [ "amdgpu" ];
+  
+      hardware.opengl.extraPackages = with pkgs; [
+        rocm-opencl-icd
+        rocm-opencl-runtime
+        amdvlk
+      ];
+
+      hardware.opengl.extraPackages32 = with pkgs; [
+        driversi686Linux.amdvlk
+      ];
+
+      hardware.opengl = {
+        driSupport = lib.mkDefault true;
+        driSupport32Bit = lib.mkDefault true;
+      };
+
+      environment.variables.AMD_VULKAN_ICD = lib.mkDefault "RADV";
+    }
+    (lib.mkIf config.hardware.amdgpu.loadInInitrd {
+      boot.initrd.kernelModules = [ "amdgpu" ];
+    })
+  ];
 }