diff --git a/common/default.nix b/common/default.nix
index b3582201..7810eed6 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -27,19 +27,7 @@
   };
 
   nix = {
-    # FIXME: wait for this to reach nixos-unstable https://pr-tracker.nelim.org/?pr=341007
-    package = pkgs.nixVersions.nix_2_24.overrideAttrs (o: rec {
-      version = "2.24.6";
-
-      src = pkgs.fetchFromGitHub {
-        owner = "NixOS";
-        repo = "nix";
-        rev = version;
-        hash = "sha256-kgq3B+olx62bzGD5C6ighdAoDweLq+AebxVHcDnKH4w=";
-      };
-
-      meta = removeAttrs o.meta ["knownVulnerabilities"];
-    });
+    package = pkgs.nixVersions.nix_2_24;
 
     # Edit nix.conf
     settings = {
diff --git a/devices/nos/modules/docker/forgejo/images/act_runner.nix b/devices/nos/modules/docker/forgejo/images/act_runner.nix
index 2d2caf94..9babbbf1 100644
--- a/devices/nos/modules/docker/forgejo/images/act_runner.nix
+++ b/devices/nos/modules/docker/forgejo/images/act_runner.nix
@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "vegardit/gitea-act-runner";
-  imageDigest = "sha256:acc510a4754aa871dcaac69396055fea3117b5378a36efd9fbf3b3db542fa81a";
-  sha256 = "12a9gw7nl5g4ji8jcg9w55a5zx7q9ny80bfk5qhl05yj7h6514ni";
+  imageDigest = "sha256:378efec2a8f9e17874965b6a03ea935b0195eb85bdf60305eee994f684134f27";
+  sha256 = "1g5apdg8mycda2rwfnfjr3h5005l3gn2i2s5zywiijfx6piif3k4";
   finalImageName = "vegardit/gitea-act-runner";
   finalImageTag = "dind-latest";
 }
diff --git a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix
index 9264149e..5a250660 100644
--- a/devices/nos/modules/docker/media/bazarr/images/bazarr.nix
+++ b/devices/nos/modules/docker/media/bazarr/images/bazarr.nix
@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/linuxserver/bazarr";
-  imageDigest = "sha256:476c315f0381d0b8c7921fbf3116b65e96ae32128df5fd27600e97213b862809";
-  sha256 = "0c59zsddmp8din5c516zhcsxfjx6a5w0yam7ynavsa227cjxa0m5";
+  imageDigest = "sha256:71f545e4a6cfda02798fd531bfc27b14cbf7345bb28fe503467fb1ab13c3bfbc";
+  sha256 = "1ibq19ixkls3dwmmqcjz9ybia6fmyw5bb0zmx5sl53qnnbr707j4";
   finalImageName = "ghcr.io/linuxserver/bazarr";
   finalImageTag = "latest";
 }
diff --git a/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix b/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix
index 99f61670..77c0216a 100644
--- a/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix
+++ b/devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix
@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/linuxserver/prowlarr";
-  imageDigest = "sha256:c1318191d5211ac7462c754422eafe350ed0de61c4160065a420896068ec1ccc";
-  sha256 = "1ddvrlh24x0blk1vkvxvxwi9hv4hqagy8fd4183vvpcf3c1rfpps";
+  imageDigest = "sha256:bddc64a17aa38972f4c032f67efc3bf0a498883257e615a2d807ca44550cebf0";
+  sha256 = "0wrs6vw4nbbcvjkyfbjbfbwwv1h77m2m6374jd59qffq5bpz1fw7";
   finalImageName = "ghcr.io/linuxserver/prowlarr";
   finalImageTag = "latest";
 }
diff --git a/flake.lock b/flake.lock
index 637e04ab..67b33e00 100644
Binary files a/flake.lock and b/flake.lock differ
diff --git a/flake.nix b/flake.nix
index cb36159b..e1b0da05 100644
Binary files a/flake.nix and b/flake.nix differ
diff --git a/legacyPackages/firefox-addons/generated-firefox-addons.nix b/legacyPackages/firefox-addons/generated-firefox-addons.nix
index a328e2ea..74c1061a 100644
--- a/legacyPackages/firefox-addons/generated-firefox-addons.nix
+++ b/legacyPackages/firefox-addons/generated-firefox-addons.nix
@@ -82,10 +82,10 @@
   };
   "darkreader" = buildFirefoxXpiAddon {
     pname = "darkreader";
-    version = "4.9.89";
+    version = "4.9.92";
     addonId = "addon@darkreader.org";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4341235/darkreader-4.9.89.xpi";
-    sha256 = "f4a5b4d5966d99cc68b31a9d2072cdb6388efefa9d45746f03d76e3c897c49be";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4351387/darkreader-4.9.92.xpi";
+    sha256 = "be55b3ea5bab95743d43823d9290fa820035b89c4d07943b568111d837a98226";
     meta = with lib; {
       homepage = "https://darkreader.org/";
       description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing.";
diff --git a/legacyPackages/hass-components/extended-ollama-conversation.nix b/legacyPackages/hass-components/extended-ollama-conversation.nix
index 7046404e..affc726b 100644
--- a/legacyPackages/hass-components/extended-ollama-conversation.nix
+++ b/legacyPackages/hass-components/extended-ollama-conversation.nix
@@ -10,6 +10,7 @@
   manifest = fromJSON (readFile "${extended-ollama-conversation-src}/custom_components/extended_ollama_conversation/manifest.json");
 
   openai = python3Packages.openai.overrideAttrs (o: rec {
+    name = "${o.pname}-${version}";
     version = "1.3.8";
 
     src = fetchFromGitHub {
diff --git a/outputs.nix b/outputs.nix
index dfd39fa1..f06eabc1 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -11,7 +11,7 @@
       nixpkgs = mkInput {
         owner = "NixOS";
         repo = "nixpkgs";
-        ref = "nixos-unstable";
+        ref = "nixos-unstable-small";
       };
 
       home-manager = mkDep {