diff --git a/hosts/common/programs/sway/default.nix b/hosts/common/programs/sway/default.nix
index 597534533..5941edc22 100644
--- a/hosts/common/programs/sway/default.nix
+++ b/hosts/common/programs/sway/default.nix
@@ -45,7 +45,7 @@ let
       passthru.sway-unwrapped = configuredSway;
     };
 
-  wlroots = (pkgs'.wlroots.override {
+  wlroots = (pkgs'.wlroots_0_18.override {
     # wlroots seems to launch Xwayland itself, and i can't easily just do that myself externally.
     # so in order for the Xwayland it launches to be sandboxed, i need to patch the sandboxed version in here.
     xwayland = config.sane.programs.xwayland.package;
diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix
index 321468b84..2316dc651 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/master.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix
@@ -14,8 +14,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "b16949a1daf97386a4413d47af4ab02600284759";
-  sha256 = "sha256-DgE73JMGwh1Oygb/3knGzSbWSyKnz9YKiiHGxCOmYAI=";
-  version = "unstable-2025-05-30";
+  rev = "ce490d7b984988f8689470d8608b6253860f990a";
+  sha256 = "sha256-MlwN0xoon4RB/nkQyTrG6ceiwn+AsMEMt3F4W3UN3Zc=";
+  version = "unstable-2025-05-31";
   branch = "master";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
index 3477141de..d1499aea0 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "79a819cf665ffbbc2e0c507298a90bed06c15273";
-  sha256 = "sha256-gxAEIv3+rZhGAkTKbq3LWTX5keAINoe1Uai8Gnkbt5k=";
-  version = "unstable-2025-05-30";
+  rev = "302559672506a0b0a931e47dc00b2714d63a0e75";
+  sha256 = "sha256-eAsjRNxnqVFX6OJDvH7dHk7+vwC8hQFdHpRqmhpKyho=";
+  version = "unstable-2025-05-31";
   branch = "staging-next";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
index c0b0adab7..d600651c0 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "a80900301d3fc93066800d8910bd0ae87e4ec517";
-  sha256 = "sha256-w7ojxrlyBxsXTuBLqCjDH0DwtZEaC40sSWJYr66m4qg=";
-  version = "unstable-2025-05-30";
+  rev = "f34f229df31d221f2cab03287231c39972a39354";
+  sha256 = "sha256-5HVrUhdbbUCGYF+MM4SqeaLs9nT8AEOqQxotF6GE9UQ=";
+  version = "unstable-2025-05-31";
   branch = "staging";
 }