diff --git a/framework/7040-amd/default.nix b/framework/7040-amd/default.nix
index ee976b4..7b41313 100644
--- a/framework/7040-amd/default.nix
+++ b/framework/7040-amd/default.nix
@@ -7,15 +7,10 @@
     ../../common/pc/laptop/ssd
   ];
 
-  boot.kernelParams = [
-    # Fixes a regression in s2idle, making it more power efficient than deep sleep
-    "acpi_osi=\"!Windows 2020\""
-  ];
-
   # Newer kernel is better for amdgpu driver updates
   # Requires at least 5.16 for working wi-fi and bluetooth (RZ616, kmod mt7922):
   # https://wireless.wiki.kernel.org/en/users/drivers/mediatek
-  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") (lib.mkDefault pkgs.linuxPackages_latest);
+  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.1") (lib.mkDefault pkgs.linuxPackages_latest);
 
   # AMD has better battery life with PPD over TLP:
   # https://community.frame.work/t/responded-amd-7040-sleep-states/38101/13
@@ -32,18 +27,10 @@
 
   # Custom udev rules
   services.udev.extraRules = ''
-    # Fix headphone noise when on powersave
-    # https://community.frame.work/t/headphone-jack-intermittent-noise/5246/55
-    SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa0e0", ATTR{power/control}="on"
     # Ethernet expansion card support
     ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
   '';
 
-  # Mis-detected by nixos-generate-config
-  # https://github.com/NixOS/nixpkgs/issues/171093
-  # https://wiki.archlinux.org/title/Framework_Laptop#Changing_the_brightness_of_the_monitor_does_not_work
-  hardware.acpilight.enable = lib.mkDefault true;
-
   # Needed for desktop environments to detect/manage display brightness
   hardware.sensor.iio.enable = lib.mkDefault true;
 }