diff --git a/gigabyte/b550/b550-fix-suspend.nix b/gigabyte/b550/b550-fix-suspend.nix
index 49868093..abc04a2d 100644
--- a/gigabyte/b550/b550-fix-suspend.nix
+++ b/gigabyte/b550/b550-fix-suspend.nix
@@ -1,35 +1,13 @@
-{ pkgs, lib, ... } :
-
 {
-  systemd.services.bugfixSuspend-GPP0 = {
-    enable            = lib.mkDefault true;
-    description       = "Fix crash on wakeup from suspend/hibernate (b550 bugfix)";
-    unitConfig = {
-      Type            = "oneshot";
-    };
-    serviceConfig = {
-      User            = "root"; # root may not be necessary
-      # check for gppN, disable if enabled
-      # lifted from  https://www.reddit.com/r/gigabyte/comments/p5ewjn/comment/ksbm0mb/ /u/Demotay
-      ExecStart       = "-${pkgs.bash}/bin/bash -c 'if grep 'GPP0' /proc/acpi/wakeup | grep -q 'enabled'; then echo 'GPP0' > /proc/acpi/wakeup; fi'"; 
-      RemainAfterExit = "yes";  # required to not toggle when `nixos-rebuild switch` is ran
-      
-    };
-    wantedBy = ["multi-user.target"];
-  };
-
-  systemd.services.bugfixSuspend-GPP8 = {
-    enable            = lib.mkDefault true;
-    description       = "Fix crash on wakeup from suspend/hibernate (b550 bugfix)";
-    unitConfig = {
-      Type            = "oneshot";
-    };
-    serviceConfig = {
-      User            = "root";
-      ExecStart       = "-${pkgs.bash}/bin/bash -c 'if grep 'GPP8' /proc/acpi/wakeup | grep -q 'enabled'; then echo 'GPP8' > /proc/acpi/wakeup; fi'";
-      RemainAfterExit = "yes";
-    };
-    wantedBy = ["multi-user.target"];
-  };
-
+  # Work around an issue causing the system to unsuspend immediately after suspend
+  # and/or hang after suspend.
+  #
+  # See https://www.reddit.com/r/gigabyte/comments/p5ewjn/comment/ksbm0mb/ /u/Demotay
+  #
+  # Most suggestions elsewhere are to disable GPP0 and/or GPP8 using /proc/acpi/wakeup, but that is
+  # inconvenient because it toggles. This does essentially the same thing using udev, which can set
+  # the wakeup attribute to a specific value.
+  services.udev.extraRules = ''
+    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x1022", ATTR{device}=="0x1483", ATTR{power/wakeup}="disabled"
+  '';
 }