diff --git a/README.md b/README.md
index 02004b0..6a490e1 100644
--- a/README.md
+++ b/README.md
@@ -57,3 +57,8 @@ Testing /dev/tenstorrent/1 @ 0000:76:00.0
 ```
 
 As far as I can tell, these failures are exercised by the tests, and a clean `stdout` means there is no issue.
+
+
+# TODO
+
+- [ ] Better update system
diff --git a/pkgs/kmd/default.nix b/pkgs/kmd/default.nix
index c819150..71914df 100644
--- a/pkgs/kmd/default.nix
+++ b/pkgs/kmd/default.nix
@@ -4,10 +4,10 @@ let
   src = pkgs.fetchFromGitHub {
     owner = "tenstorrent";
     repo = "tt-kmd";
-    rev = "715a5d76e5dbb6d8972d4aa92e8cbe3434986b9f";
-    hash = "sha256-OCnGhvIDIqkQJXlIpOVnP0O9cA9J7/bz1JPAOpeDNYQ=";
+    rev = "refs/tags/ttkmd-${version}";
+    hash = "sha256-TTd+SXUQ/RwsZB7YIc0QsE9zHBCYO3NRrCub7/K1rP4=";
   };
-  version = "unstable-2024-09-06";
+  version = "1.31";
 in
 {
   kmd = pkgs.stdenv.mkDerivation {
@@ -41,6 +41,9 @@ in
   test = pkgs.stdenv.mkDerivation {
     pname = "tt-kmd-test";
 
+    # https://github.com/tenstorrent/tt-kmd/pull/37
+    patches = ./limits.patch;
+
     inherit src version;
 
     nativeBuildInputs = [ pkgs.gnumake ];
diff --git a/pkgs/kmd/limits.patch b/pkgs/kmd/limits.patch
new file mode 100644
index 0000000..1f9edd1
--- /dev/null
+++ b/pkgs/kmd/limits.patch
@@ -0,0 +1,12 @@
+diff --git a/test/query_mappings.cpp b/test/query_mappings.cpp
+index 0721485..7fe7ae4 100644
+--- a/test/query_mappings.cpp
++++ b/test/query_mappings.cpp
+@@ -16,6 +16,7 @@
+ #include <set>
+ #include <string>
+ #include <cstddef>
++#include <limits>
+ #include <cstdint>
+
+ #include <sys/ioctl.h>
diff --git a/pkgs/smi/default.nix b/pkgs/smi/default.nix
index 9fc2209..b88382d 100644
--- a/pkgs/smi/default.nix
+++ b/pkgs/smi/default.nix
@@ -8,13 +8,13 @@ with pkgs.python3Packages;
 
 buildPythonPackage rec {
   pname = "tt-smi";
-  version = "unstable-2024-09-27";
+  version = "3.0.5";
 
   src = pkgs.fetchFromGitHub {
     owner = "tenstorrent";
     repo = "tt-smi";
-    rev = "052f1ce49b94581710744a91939121e01c24b5f2";
-    hash = "sha256-IA60unZpSWVnMnDjDIC31QtURi9nIr/F7s7PGZilPcw=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-+Dw6F9aupe4VTWQFiNWGKMDOTmxwCW2bHuDQxWxluUc=";
   };
 
   format = "pyproject";
diff --git a/pkgs/tools-common/default.nix b/pkgs/tools-common/default.nix
index a8c6114..f6f1922 100644
--- a/pkgs/tools-common/default.nix
+++ b/pkgs/tools-common/default.nix
@@ -4,13 +4,13 @@ with pkgs.python3Packages;
 
 buildPythonPackage rec {
   pname = "tools-common";
-  version = "unstable-2024-09-27";
+  version = "1.4.12";
 
   src = pkgs.fetchFromGitHub {
     owner = "tenstorrent";
     repo = "tt-tools-common";
-    rev = "a89b2db6d086698ab0351a820ea689b4809429a3";
-    sha256 = "sha256-xeiJQkWsg9p8re2XJai0mNWuP7LwJ9faj3+Z3U/KvzI=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-FKV1ojY9m5aRfnrU6LjXVcUnNAmNNXiGaUax6RE/8Vs=";
   };
 
   format = "pyproject";