diff --git a/modules/hardware/amd-gpu.nix b/modules/hardware/amd-gpu.nix
index bf43a7c..d25487f 100644
--- a/modules/hardware/amd-gpu.nix
+++ b/modules/hardware/amd-gpu.nix
@@ -5,26 +5,38 @@ in {
     enable = lib.mkEnableOption "Enables amd gpus";
   };
 
-  config = lib.mkIf cfg.enable {
-    boot.kernelParams =
-      [ "amdgpu.ppfeaturemask=0xfff7ffff" "split_lock_detect=off" ];
+  config =
+    let
+      mesa-new = pkgs.mesa-git.mesa.overrideAttrs (oldAttrs: {
+        src = pkgs.fetchFromGitLab {
+          domain = "gitlab.freedesktop.org";
+          owner = "hakzsam";
+          repo = "mesa";
+          rev = "e76537447570f64b138d6338ca59117da18c113c";
+          hash = "sha256-k618hjo0H0O3FtAJp3YT8+cfFvMXI+wCmbv9lxDhrIc=";
+        };
+      });
+    in
+    lib.mkIf cfg.enable {
+      boot.kernelParams =
+        [ "amdgpu.ppfeaturemask=0xfff7ffff" "split_lock_detect=off" ];
 
-    hardware.graphics = {
-      enable = true;
-      enable32Bit = true;
-      package = lib.mkForce pkgs.mesa-git.mesa.drivers;
-      extraPackages = with pkgs; [ mesa-git.amdvlk ];
+      hardware.graphics = {
+        enable = true;
+        enable32Bit = true;
+        package = lib.mkForce mesa-new.drivers;
+        extraPackages = with pkgs; [ mesa-git.amdvlk ];
+      };
+
+      hardware.amdgpu.initrd.enable = lib.mkDefault true;
+      services.xserver.videoDrivers = [ "amdgpu" ];
+      # controller (overclock, undervolt, fan curves)
+      environment.systemPackages = with pkgs; [
+        lact
+        nvtopPackages.amd
+        amdgpu_top
+      ];
+      systemd.packages = with pkgs; [ lact ];
+      systemd.services.lactd.wantedBy = [ "multi-user.target" ];
     };
-
-    hardware.amdgpu.initrd.enable = lib.mkDefault true;
-    services.xserver.videoDrivers = [ "amdgpu" ];
-    # controller (overclock, undervolt, fan curves)
-    environment.systemPackages = with pkgs; [
-      lact
-      nvtopPackages.amd
-      amdgpu_top
-    ];
-    systemd.packages = with pkgs; [ lact ];
-    systemd.services.lactd.wantedBy = [ "multi-user.target" ];
-  };
 }
diff --git a/modules/kernel-testing.nix b/modules/kernel-testing.nix
index c1a56d1..62349b4 100644
--- a/modules/kernel-testing.nix
+++ b/modules/kernel-testing.nix
@@ -73,10 +73,8 @@ in
 
           src = fetchurl {
             url =
-              "https://gitlab.freedesktop.org/agd5f/linux/-/archive/amd-drm-next-6.15-2025-03-14/linux-amd-drm-next-6.15-2025-03-14.tar.gz";
-            # After the first build attempt, look for "hash mismatch" and then 2 lines below at the "got:" line.
-            # Use "sha256-....." value here.
-            hash = "sha256-/9EvJNBSKteXljrZzmaQkbZ7o4etCe0yFM3JJg/jD7o=";
+              "https://gitlab.freedesktop.org/agd5f/linux/-/archive/amd-drm-next-6.15-2025-03-21/linux-amd-drm-next-6.15-2025-03-21.tar.gz";
+            hash = "sha256-sLS6uFo2KPbDdz8BhB1X10wQiiYdtT/Ny0Ii19F6feY=";
           };
           kernelPatches = [ ];