diff --git a/ci-root.nix b/ci-root.nix
index 1882225769..11952b0a60 100644
--- a/ci-root.nix
+++ b/ci-root.nix
@@ -41,7 +41,7 @@ let
       rust = depot.rust;
     };
     aarch64-linux = builtins.removeAttrs x86_64-linux [ "home-manager" "pkg-authentik" "web-barf" ] // {
-      pkgs = builtins.removeAttrs x86_64-linux.pkgs [ "lutris" "plex-pass" "sheepshaver" "fr24feed" "javaws-env" ];
+      pkgs = builtins.removeAttrs x86_64-linux.pkgs [ "lutris" "plex-pass" "sheepshaver" "fr24feed" "javaws-env" "world-of-goo2" ];
     };
     x86_64-darwin = {
       machine = depot.ops.nix-darwin.systems;
diff --git a/rust/matrix2mqtt/package.nix b/rust/matrix2mqtt/package.nix
index 5daecc9101..8f21878430 100644
--- a/rust/matrix2mqtt/package.nix
+++ b/rust/matrix2mqtt/package.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-{ lib, rustPlatform }:
+{ lib, stdenv, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "matrix2mqtt";
@@ -17,5 +17,8 @@ rustPlatform.buildRustPackage rec {
     ];
   };
 
-  cargoHash = "sha256-0R6hN5cNlj8+UzZ9oM4f74UGGCS1AKlDgHaQyKq/y0Q=";
+  cargoHash = {
+    x86_64-linux = "sha256-0R6hN5cNlj8+UzZ9oM4f74UGGCS1AKlDgHaQyKq/y0Q=";
+    aarch64-linux = "sha256-w4d3ThTQTd9ahR7gRunMvuSIoNFlfRa/x1SM2/icJmg=";
+  }.${stdenv.hostPlatform.system};
 }
diff --git a/third_party/default.nix b/third_party/default.nix
index 38dc171894..9c1787c6a6 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -94,6 +94,7 @@ let
   };
   poetry2nixSrc = nixpkgs.runCommand "poetry2nix-patched" {
     patches = [
+      ./poetry2nix-arch-dependent.patch
     ];
     src = poetry2nixSrcRaw;
   } ''
diff --git a/third_party/poetry2nix-arch-dependent.patch b/third_party/poetry2nix-arch-dependent.patch
new file mode 100644
index 0000000000..bb46352b2c
--- /dev/null
+++ b/third_party/poetry2nix-arch-dependent.patch
@@ -0,0 +1,22 @@
+diff --git a/overrides/default.nix b/overrides/default.nix
+index a55ccb45f8..357c294017 100644
+--- a/overrides/default.nix
++++ b/overrides/default.nix
+@@ -616,7 +616,7 @@
+             "42.0.8" = "sha256-PgxPcFocEhnQyrsNtCN8YHiMptBmk1PUhEDQFdUR1nU=";
+             "43.0.0" = "sha256-TEQy8PrIaZshiBFTqR/OJp3e/bVM1USjcmpDYcjPJPM=";
+             "43.0.1" = "sha256-wiAHM0ucR1X7GunZX8V0Jk2Hsi+dVdGgDKqcYjSdD7Q=";
+-            "43.0.3" = "sha256-d3Gt4VrBWk6qowwX0Epp4mc1PbySARVU9YMsHYKImCs=";
++            "43.0.3" = { x86_64-linux = "sha256-d3Gt4VrBWk6qowwX0Epp4mc1PbySARVU9YMsHYKImCs="; aarch64-linux = "sha256-fy7dI6ZzyG4sPtw1923HYXtMcPyd61oIf5o0ppF/78A="; }.${pkgs.stdenv.hostPlatform.system};
+             "44.0.0" = "sha256-LJIY2O8ul36JQmhiW8VhLCQ0BaX+j+HGr3e8RUkZpc8=";
+             "44.0.1" = "sha256-6inZ5HEnQmW5U+H+QG5eRHHdnYYnUQPXNvx6iBGXlOk=";
+           }.${version} or (
+@@ -3321,7 +3321,7 @@
+             "0.19.1" = "sha256-qIXdoCEVGCGUnTicZp4bUTJyGpFy9dwWY03lXUbxiHg=";
+             "0.20.0" = "sha256-5vbR2EbrAPJ8pb78tj/+r9nOWgQDT5aO/LUQI4kAGjU=";
+             "0.20.1" = "sha256-vqJCGlp5S2wECfgleCexCb9xegA8b6wo7YNBbcsbXqk=";
+-            "0.21.0" = "sha256-VOmMNEdKHrPKJzs+D735Y52y47MubPwLlfkvB7Glh14=";
++            "0.21.0" = { x86_64-linux = "sha256-VOmMNEdKHrPKJzs+D735Y52y47MubPwLlfkvB7Glh14="; aarch64-linux = "sha256-EDIJw2lZ5nhANTp8bdkkyeSMHD2btHZ+IeN2ROkJN9o="; }.${pkgs.stdenv.hostPlatform.system};
+             "0.22.3" = "sha256-m01OB4CqDowlTAiDQx6tJ7SeP3t+EtS9UZ7Jad6Ccvc=";
+           }.${version} or (
+             lib.warn "Unknown rpds-py version: '${version}'. Please update getCargoHash." lib.fakeHash