diff --git a/app/app.nix b/app/app.nix
index ad92423d51..df3a39241f 100644
--- a/app/app.nix
+++ b/app/app.nix
@@ -3,12 +3,12 @@ _: {
     {
       lib,
       pkgs,
-      jsPkgs,
+      pkgsUnstable,
       ensureAtRepositoryRoot,
       ...
     }:
     let
-      deps = with jsPkgs; [
+      deps = with pkgsUnstable; [
         python3
         pkg-config
         nodePackages_latest.nodejs
@@ -18,7 +18,7 @@ _: {
     in
     {
       packages = {
-        app = jsPkgs.buildNpmPackage {
+        app = pkgsUnstable.buildNpmPackage {
           npmDepsHash = "sha256-o215ZVz15bG3gRLsyLaGqkE8AKheroRkqQvNum7bfzg=";
           src = ./.;
           sourceRoot = "app";
diff --git a/app2/app2.nix b/app2/app2.nix
index a0ed5462a0..0ae1c99a62 100644
--- a/app2/app2.nix
+++ b/app2/app2.nix
@@ -3,12 +3,12 @@ _: {
     {
       lib,
       pkgs,
-      jsPkgs,
+      pkgsUnstable,
       ensureAtRepositoryRoot,
       ...
     }:
     let
-      deps = with jsPkgs; [
+      deps = with pkgsUnstable; [
         python3
         stdenv.cc
         pkg-config
@@ -19,7 +19,7 @@ _: {
     in
     {
       packages = {
-        app2 = jsPkgs.buildNpmPackage {
+        app2 = pkgsUnstable.buildNpmPackage {
           npmDepsHash = "sha256-cgmgvbMV9lIFG4YEA5W2Vk3uvjUIp2BNWcQrEmrortE=";
           src = ./.;
           sourceRoot = "app2";
diff --git a/ceremony/ceremony.nix b/ceremony/ceremony.nix
index dd0f0de45c..54a7b9032c 100644
--- a/ceremony/ceremony.nix
+++ b/ceremony/ceremony.nix
@@ -3,12 +3,12 @@ _: {
     {
       lib,
       pkgs,
-      jsPkgs,
+      pkgsUnstable,
       ensureAtRepositoryRoot,
       ...
     }:
     let
-      deps = with jsPkgs; [
+      deps = with pkgsUnstable; [
         pkg-config
         python3
         nodePackages_latest.nodejs
@@ -17,7 +17,7 @@ _: {
     in
     {
       packages = {
-        ceremony = jsPkgs.buildNpmPackage {
+        ceremony = pkgsUnstable.buildNpmPackage {
           npmDepsHash = "sha256-2s556is4PJaGmxQhIUPZLINh6J6ngeTf32bwDtl+v6Q=";
           src = ./.;
           sourceRoot = "ceremony";
diff --git a/devShell.nix b/devShell.nix
index e12244cd03..35e6466bda 100644
--- a/devShell.nix
+++ b/devShell.nix
@@ -2,12 +2,12 @@ _: {
   perSystem =
     {
       pkgs,
-      jsPkgs,
+      pkgsUnstable,
       ensureAtRepositoryRoot,
       ...
     }:
     let
-      deps = with jsPkgs; [
+      deps = with pkgsUnstable; [
         vips
         pkg-config
         nodePackages_latest.nodejs
@@ -27,7 +27,7 @@ _: {
               nix run .#fmt-site
 
               echo "Applying biome fmt"
-              ${jsPkgs.biome}/bin/biome check . --write --unsafe \
+              ${pkgsUnstable.biome}/bin/biome check . --write --unsafe \
                 --log-level="info" \
                 --log-kind="pretty" \
                 --diagnostic-level="info"
diff --git a/docs/docs.nix b/docs/docs.nix
index b6e67dc808..f3fa44f70b 100644
--- a/docs/docs.nix
+++ b/docs/docs.nix
@@ -3,12 +3,12 @@ _: {
     {
       lib,
       mkCi,
-      jsPkgs,
+      pkgsUnstable,
       ensureAtRepositoryRoot,
       ...
     }:
     let
-      deps = with jsPkgs; [
+      deps = with pkgsUnstable; [
         vips
         pkg-config
         nodePackages_latest.nodejs
@@ -18,7 +18,7 @@ _: {
     {
       packages = {
         docs = mkCi false (
-          jsPkgs.buildNpmPackage {
+          pkgsUnstable.buildNpmPackage {
             npmDepsHash = "sha256-pDdKyuOeurWp9LbYFb8/IFdvNPihtpCUi/SIvBN0ZmY=";
             src = ./.;
             srcs = [
@@ -46,7 +46,7 @@ _: {
       apps = {
         docs-dev-server = {
           type = "app";
-          program = jsPkgs.writeShellApplication {
+          program = pkgsUnstable.writeShellApplication {
             name = "docs-dev-server";
             runtimeInputs = deps;
             text = ''
@@ -61,7 +61,7 @@ _: {
         };
         docs-check = {
           type = "app";
-          program = jsPkgs.writeShellApplication {
+          program = pkgsUnstable.writeShellApplication {
             name = "docs-check";
             runtimeInputs = deps;
             text = ''
@@ -75,13 +75,13 @@ _: {
               npm_config_yes=true npx astro check
               npm_config_yes=true npx astro build
 
-              nix build .\#checks.${jsPkgs.system}.spellcheck --print-build-logs
+              nix build .\#checks.${pkgsUnstable.system}.spellcheck --print-build-logs
             '';
           };
         };
         deploy-docs-ipfs = {
           type = "app";
-          program = jsPkgs.writeShellApplication {
+          program = pkgsUnstable.writeShellApplication {
             name = "deploy-docs-ipfs";
             runtimeInputs = deps;
             text = ''
diff --git a/docs/openapi.nix b/docs/openapi.nix
index e0ea6a6aaf..0423492a37 100644
--- a/docs/openapi.nix
+++ b/docs/openapi.nix
@@ -2,7 +2,6 @@ _: {
   perSystem =
     {
       pkgs,
-      unstablePkgs,
       openapi,
       ensureAtRepositoryRoot,
       mkCi,
@@ -17,7 +16,7 @@ _: {
               {
                 buildInputs =
                   [ biome ]
-                  ++ (with unstablePkgs; [
+                  ++ (with pkgs; [
                     yq
                     jq
                     bun
diff --git a/flake.lock b/flake.lock
index 386b4e9539..0f319dddd7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,22 +4,20 @@
       "inputs": {
         "flake-parts": "flake-parts",
         "haskell-flake": "haskell-flake",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1682181677,
-        "narHash": "sha256-El8WQ2ccxWwkSrjuwKNR0gD/O7vS/KLBY4Q2/nF8m1c=",
+        "lastModified": 1733918199,
+        "narHash": "sha256-hSuGa8Hh67EHr2x812Ay6WFyFT2BGKn+zk+FJWeKXPg=",
         "owner": "hercules-ci",
         "repo": "arion",
-        "rev": "6a1f03329c400327b3b2e0ed5e1efff11037ba67",
+        "rev": "9f01fb79f61f53fe31d5ef831e420ab9ad252b99",
         "type": "github"
       },
       "original": {
         "owner": "hercules-ci",
+        "ref": "v0.2.2.0",
         "repo": "arion",
-        "rev": "6a1f03329c400327b3b2e0ed5e1efff11037ba67",
         "type": "github"
       }
     },
@@ -181,11 +179,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1675933616,
-        "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=",
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "47478a4a003e745402acf63be7f9a092d51b83d7",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
         "type": "github"
       },
       "original": {
@@ -416,27 +414,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1686501370,
-        "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
+        "lastModified": 1733212471,
+        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
-        "type": "github"
-      }
-    },
-    "nixpkgs-go": {
-      "locked": {
-        "lastModified": 1740560979,
-        "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5135c59491985879812717f4c9fea69604e7f26f",
+        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
         "type": "github"
       },
       "original": {
@@ -446,7 +428,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-js": {
+    "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1738142207,
         "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
@@ -478,55 +460,55 @@
         "type": "github"
       }
     },
-    "nixpkgs-solc": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1707268954,
-        "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
+        "lastModified": 1742816840,
+        "narHash": "sha256-AYQg2eTjw2hzqQfvoAsIdXWGr4V/VY8u87WoaiazA2g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
+        "rev": "27cc9ff7ddd91ad569b289094daa32d633c01b2d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "release-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs_3": {
       "locked": {
-        "lastModified": 1726937504,
-        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
+        "lastModified": 1701985094,
+        "narHash": "sha256-SrEEAeDvsdehVrvoq47pGFZ+p/QbUcTovL84S7tn6Sk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
+        "rev": "a24421da00be9ebfdade97135db98a1fac5173d4",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "release-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1701985094,
-        "narHash": "sha256-SrEEAeDvsdehVrvoq47pGFZ+p/QbUcTovL84S7tn6Sk=",
+        "lastModified": 1736320768,
+        "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a24421da00be9ebfdade97135db98a1fac5173d4",
+        "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1731890469,
         "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
@@ -562,7 +544,7 @@
     "process-compose": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1712440905,
@@ -616,12 +598,9 @@
         "ics23": "ics23",
         "interchain-security": "interchain-security",
         "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-go": "nixpkgs-go",
-        "nixpkgs-js": "nixpkgs-js",
-        "nixpkgs-lnav": "nixpkgs-lnav",
-        "nixpkgs-solc": "nixpkgs-solc",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixpkgs-lnav": "nixpkgs-lnav",
         "osmosis": "osmosis",
         "process-compose": "process-compose",
         "public-awesome-launchpad": "public-awesome-launchpad",
@@ -636,16 +615,14 @@
     },
     "rust-overlay": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1730169013,
-        "narHash": "sha256-rvgF03ODu1uEYbdEsloN4fQrJ+k1NOv/7MJvCpHHnBk=",
+        "lastModified": 1742783666,
+        "narHash": "sha256-IwdSl51NL6V0f+mYXZR0UTKaGleOsk9zV3l6kt5SUWw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "92eb1268cc19609f2fe24311b871f37bf3dc5afd",
+        "rev": "60766d63c227d576510ecfb5edd3a687d56f6bc7",
         "type": "github"
       },
       "original": {
@@ -741,7 +718,7 @@
     },
     "treefmt-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1732292307,
diff --git a/flake.nix b/flake.nix
index 363ab9c7a7..83bdd8e1fd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,14 +5,9 @@
       url = "github:hellwolf/solc.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixpkgs.url = "github:NixOS/nixpkgs?rev=75a5ebf473cd60148ba9aec0d219f72e5cf52519";
-    # Track a separate nixpkgs for latest solc
-    nixpkgs-solc.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-go.url = "github:NixOS/nixpkgs/nixos-unstable";
-    # Track a separate nixpkgs for unstable nixos
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
     # Track a separate nixpkgs for JS/TS toolchains
-    nixpkgs-js.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     # Remove when lnav is updated on upstream nixpkgs
     nixpkgs-lnav.url = "github:cor/nixpkgs/lnav-v0.12.2-beta";
     process-compose.url = "github:F1bonacc1/process-compose";
@@ -20,29 +15,18 @@
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
-    arion = {
-      url = "github:hercules-ci/arion?rev=6a1f03329c400327b3b2e0ed5e1efff11037ba67";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    treefmt-nix = {
-      url = "github:numtide/treefmt-nix";
-    };
+    arion.url = "github:hercules-ci/arion/v0.2.2.0";
+    treefmt-nix.url = "github:numtide/treefmt-nix";
     foundry = {
       url = "github:shazow/foundry.nix/main";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    crane = {
-      url = "github:ipetkov/crane";
-    };
+    rust-overlay.url = "github:oxalica/rust-overlay";
+    crane.url = "github:ipetkov/crane";
     env-utils = {
       url = "github:oceanlewis/env-utils";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
     ibc-go = {
       url = "github:unionlabs/ibc-go-union?rev=bfabb646cf7384bd33ee672f51a0e1325f545c10";
       flake = false;
@@ -139,8 +123,6 @@
     inputs@{
       self,
       nixpkgs,
-      nixpkgs-solc,
-      nixpkgs-go,
       flake-parts,
       nix-filter,
       foundry,
@@ -256,9 +238,7 @@
             last = pkgs.lib.lists.last complete;
           };
 
-          goPkgs = import inputs.nixpkgs-go { inherit system; };
-          jsPkgs = import inputs.nixpkgs-js { inherit system; };
-          unstablePkgs = import inputs.nixpkgs-unstable { inherit system; };
+          pkgsUnstable = import inputs.nixpkgs-unstable { inherit system; };
 
           gitRev = if (builtins.hasAttr "rev" self) then self.rev else "dirty";
         in
@@ -271,9 +251,7 @@
                 dbg
                 get-flake
                 uniondBundleVersions
-                goPkgs
-                jsPkgs
-                unstablePkgs
+                pkgsUnstable
                 mkCi
                 ;
 
@@ -286,38 +264,6 @@
                   (_: super: {
                     inherit (self'.packages) devnet-utils;
 
-                    go-ethereum = super.go-ethereum.override {
-                      buildGoModule =
-                        args:
-                        super.buildGoModule (
-                          args
-                          // rec {
-                            version = "1.13.12";
-                            src = pkgs.fetchFromGitHub {
-                              owner = "ethereum";
-                              repo = "go-ethereum";
-                              rev = "v${version}";
-                              sha256 = "sha256-2olJV7Z01kuXlUGyI0v4YNW07/RfYiDUhBncCIS4s0A=";
-                            };
-                            vendorHash = "sha256-gcLVQTBpOE0DHz7/p7PENhwghftJKUDm88/4jaQ1VYw=";
-                            subPackages = [
-                              "cmd/abidump"
-                              "cmd/abigen"
-                              "cmd/bootnode"
-                              "cmd/clef"
-                              "cmd/devp2p"
-                              "cmd/era"
-                              "cmd/ethkey"
-                              "cmd/evm"
-                              "cmd/geth"
-                              "cmd/p2psim"
-                              "cmd/rlpdump"
-                              "cmd/utils"
-                            ];
-                          }
-                        );
-                    };
-
                     writeShellApplicationWithArgs = import ./tools/writeShellApplicationWithArgs.nix {
                       pkgs = super;
                     };
@@ -423,7 +369,7 @@
               name = "spellcheck";
               dontUnpack = true;
               src = ./.;
-              buildInputs = [ jsPkgs.typos ];
+              buildInputs = [ pkgsUnstable.typos ];
               doCheck = true;
               checkPhase = ''
                 cd $src/.
@@ -471,7 +417,7 @@
                 self'.packages.tdc
                 yq
               ])
-              ++ (with jsPkgs; [
+              ++ (with pkgsUnstable; [
                 bun
                 deno
                 nixd
@@ -485,7 +431,7 @@
                 nodePackages_latest.typescript-language-server
                 nodePackages_latest.vscode-langservers-extracted
               ])
-              ++ (with unstablePkgs; [
+              ++ (with pkgs; [
                 wasm-tools
                 postgresql
                 go_1_23
@@ -498,7 +444,7 @@
                   [
                     pkgs.solc
                     pkgs.foundry-bin
-                    goPkgs.sqlx-cli
+                    pkgs.sqlx-cli
                     self'.packages.hasura-cli
                     self'.packages.ignite-cli
                   ]
@@ -533,7 +479,7 @@
             inherit (self'.packages) movefmt;
             inherit
               pkgs
-              jsPkgs
+              pkgsUnstable
               rust
               ;
           };
diff --git a/galoisd/galoisd.nix b/galoisd/galoisd.nix
index a172e8e7c3..b2f98979b6 100644
--- a/galoisd/galoisd.nix
+++ b/galoisd/galoisd.nix
@@ -5,14 +5,13 @@
       self',
       pkgs,
       proto,
-      goPkgs,
       ensureAtRepositoryRoot,
       mkCi,
       ...
     }:
     {
       packages = {
-        galoisd = goPkgs.pkgsStatic.buildGo123Module (
+        galoisd = pkgs.pkgsStatic.buildGo123Module (
           {
             name = "galoisd";
             src = ./.;
@@ -29,7 +28,7 @@
                 CGO_ENABLED = 1;
                 ldflags = [
                   "-linkmode external"
-                  "-extldflags '-z noexecstack -static -L${goPkgs.musl}/lib -s -w'"
+                  "-extldflags '-z noexecstack -static -L${pkgs.musl}/lib -s -w'"
                 ];
               }
             else
@@ -37,7 +36,7 @@
           )
         );
 
-        galoisd-library = goPkgs.pkgsStatic.buildGo123Module (
+        galoisd-library = pkgs.pkgsStatic.buildGo123Module (
           {
             name = "libgalois";
             src = ./.;
@@ -49,8 +48,8 @@
             if pkgs.stdenv.isLinux then
               {
                 nativeBuildInputs = [
-                  goPkgs.musl
-                  goPkgs.pkgsStatic.binutils
+                  pkgs.musl
+                  pkgs.pkgsStatic.binutils
                 ];
                 doCheck = false;
                 CGO_ENABLED = 1;
diff --git a/lib/aptos.nix b/lib/aptos.nix
index bd86b2d3a1..c8a610e5c9 100644
--- a/lib/aptos.nix
+++ b/lib/aptos.nix
@@ -3,7 +3,6 @@ _: {
     {
       self',
       lib,
-      unstablePkgs,
       pkgs,
       system,
       config,
diff --git a/lib/galois-rpc/Cargo.toml b/lib/galois-rpc/Cargo.toml
index 441577fe90..928c248069 100644
--- a/lib/galois-rpc/Cargo.toml
+++ b/lib/galois-rpc/Cargo.toml
@@ -14,8 +14,8 @@ workspace = true
 [dependencies]
 cometbft-types        = { workspace = true, features = ["proto"] }
 protos                = { workspace = true, features = ["union+galois+api+v3", "client"] }
-serde-utils.workspace = true
 serde.workspace       = true
+serde-utils.workspace = true
 thiserror.workspace   = true
 unionlabs.workspace   = true
 
diff --git a/lib/near/near-light-client/near-light-client.nix b/lib/near/near-light-client/near-light-client.nix
index 22a4036e35..d1ce6e1ca5 100644
--- a/lib/near/near-light-client/near-light-client.nix
+++ b/lib/near/near-light-client/near-light-client.nix
@@ -3,7 +3,6 @@ _: {
     {
       self',
       lib,
-      unstablePkgs,
       pkgs,
       system,
       config,
diff --git a/lib/near/near.nix b/lib/near/near.nix
index 50274e378c..73998848d6 100644
--- a/lib/near/near.nix
+++ b/lib/near/near.nix
@@ -3,7 +3,6 @@ _: {
     {
       self',
       lib,
-      unstablePkgs,
       pkgs,
       system,
       config,
diff --git a/networks/babylon.nix b/networks/babylon.nix
index 04820ca496..55cec79352 100644
--- a/networks/babylon.nix
+++ b/networks/babylon.nix
@@ -3,7 +3,6 @@
   perSystem =
     {
       pkgs,
-      goPkgs,
       self',
       crane,
       system,
@@ -13,7 +12,7 @@
     }:
     {
       packages = {
-        babylond = goPkgs.pkgsStatic.buildGo123Module (
+        babylond = pkgs.pkgsStatic.buildGo123Module (
           {
             name = "babylond";
             src = inputs.babylon;
@@ -31,7 +30,7 @@
           // (
             let
               CGO_CFLAGS = "-I${self'.packages.libblst}/include -I${self'.packages.libblst.src}/src -I${self'.packages.libblst.src}/build -O";
-              CGO_LDFLAGS = "-z noexecstack -static -L${goPkgs.musl}/lib -L${self'.packages.libwasmvm-2_2_1}/lib -s -w";
+              CGO_LDFLAGS = "-z noexecstack -static -L${pkgs.musl}/lib -L${self'.packages.libwasmvm-2_2_1}/lib -s -w";
             in
             if pkgs.stdenv.isLinux then
               {
@@ -39,7 +38,7 @@
                 inherit CGO_LDFLAGS;
                 # Statically link if we're on linux
                 nativeBuildInputs = [
-                  goPkgs.musl
+                  pkgs.musl
                 ];
                 ldflags = [
                   "-linkmode external"
diff --git a/networks/genesis/devnet-eth/genesis.json b/networks/genesis/devnet-eth/genesis.json
index 203b52587d..808d044636 100644
--- a/networks/genesis/devnet-eth/genesis.json
+++ b/networks/genesis/devnet-eth/genesis.json
@@ -22,10 +22,11 @@
     "clique": {
       "period": 1,
       "epoch": 30000
-    }
+    },
+    "terminalTotalDifficultyPassed": true
   },
   "nonce": "0x0",
-  "timestamp": "0x6464e8bf",
+  "timestamp": "0x67e16086",
   "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000Be68fC2d8249eb60bfCf0e71D5A0d2F2e292c4eD0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
   "gasLimit": "0x1c9c380",
   "difficulty": "0x1",
diff --git a/networks/osmosis.nix b/networks/osmosis.nix
index 138ce49e76..a1c062220e 100644
--- a/networks/osmosis.nix
+++ b/networks/osmosis.nix
@@ -3,7 +3,6 @@
   perSystem =
     {
       pkgs,
-      goPkgs,
       self',
       crane,
       system,
@@ -13,7 +12,7 @@
     }:
     {
       packages = {
-        osmosisd = goPkgs.pkgsStatic.buildGo123Module (
+        osmosisd = pkgs.pkgsStatic.buildGo123Module (
           {
             name = "osmosisd";
             src = inputs.osmosis;
diff --git a/networks/services/geth.nix b/networks/services/geth.nix
index 71913262bb..45f5f6ce8a 100644
--- a/networks/services/geth.nix
+++ b/networks/services/geth.nix
@@ -9,7 +9,7 @@ let
     text = ''
       ETH_DATADIR=/geth
 
-      geth init --datadir "$ETH_DATADIR" /${config}/genesis.json
+      geth init --state.scheme=hash --datadir "$ETH_DATADIR" /${config}/genesis.json
       geth account import --datadir "$ETH_DATADIR" \
         --password /dev/null ${config}/dev-key0.prv
       geth account import --datadir "$ETH_DATADIR" \
@@ -35,6 +35,7 @@ let
         --nodiscover \
         --syncmode=full \
         --gcmode=archive \
+        --state.scheme=hash \
         --nat=none
     '';
   };
diff --git a/networks/simulation/simd.nix b/networks/simulation/simd.nix
index 4082624131..38e883dbd3 100644
--- a/networks/simulation/simd.nix
+++ b/networks/simulation/simd.nix
@@ -2,7 +2,6 @@ _: {
   perSystem =
     {
       pkgs,
-      goPkgs,
       self',
       crane,
       system,
@@ -12,7 +11,7 @@ _: {
     }:
     {
       packages = {
-        simd = goPkgs.pkgsStatic.buildGo123Module (
+        simd = pkgs.pkgsStatic.buildGo123Module (
           {
             name = "simd";
             src = pkgs.fetchFromGitHub {
@@ -39,11 +38,11 @@ _: {
               {
                 # Statically link if we're on linux
                 nativeBuildInputs = [
-                  goPkgs.musl
+                  pkgs.musl
                   libwasmvm
                 ];
                 ldflags = [
-                  "-extldflags '-z noexecstack -static -L${goPkgs.musl}/lib -L${libwasmvm}/lib'"
+                  "-extldflags '-z noexecstack -static -L${pkgs.musl}/lib -L${libwasmvm}/lib'"
                 ];
               }
             else
diff --git a/networks/stargaze.nix b/networks/stargaze.nix
index 5527dfc305..e8ddce27d5 100644
--- a/networks/stargaze.nix
+++ b/networks/stargaze.nix
@@ -3,7 +3,6 @@
   perSystem =
     {
       pkgs,
-      goPkgs,
       self',
       crane,
       system,
@@ -13,7 +12,7 @@
     }:
     {
       packages = {
-        starsd = goPkgs.pkgsStatic.buildGo123Module (
+        starsd = pkgs.pkgsStatic.buildGo123Module (
           {
             name = "starsd";
             src = inputs.stargaze;
diff --git a/networks/stride.nix b/networks/stride.nix
index b0b3b0893d..133b89c6ba 100644
--- a/networks/stride.nix
+++ b/networks/stride.nix
@@ -3,7 +3,6 @@
   perSystem =
     {
       pkgs,
-      goPkgs,
       self',
       crane,
       system,
@@ -13,7 +12,7 @@
     }:
     {
       packages = {
-        strided = goPkgs.pkgsStatic.buildGo123Module (
+        strided = pkgs.pkgsStatic.buildGo123Module (
           {
             name = "strided";
             src = inputs.stride;
@@ -39,12 +38,12 @@
               {
                 # Statically link if we're on linux
                 nativeBuildInputs = [
-                  goPkgs.musl
+                  pkgs.musl
                   libwasmvm-1_5_8
                 ];
                 ldflags = [
                   "-linkmode external"
-                  "-extldflags '-Wl,-z,muldefs -z noexecstack -static -L${goPkgs.musl}/lib -L${libwasmvm-1_5_8}/lib'"
+                  "-extldflags '-Wl,-z,muldefs -z noexecstack -static -L${pkgs.musl}/lib -L${libwasmvm-1_5_8}/lib'"
                 ];
               }
             else
diff --git a/sentinel/sentinel.nix b/sentinel/sentinel.nix
index 2bc91e2db4..c2bb320164 100644
--- a/sentinel/sentinel.nix
+++ b/sentinel/sentinel.nix
@@ -3,13 +3,13 @@
   perSystem =
     {
       pkgs,
-      jsPkgs,
+      pkgsUnstable,
       ensureAtRepositoryRoot,
       lib,
       ...
     }:
     let
-      deps = with jsPkgs; [
+      deps = with pkgsUnstable; [
         python3
         pkg-config
         nodePackages_latest.nodejs
@@ -19,7 +19,7 @@
     in
     {
       packages = {
-        sentinel = jsPkgs.buildNpmPackage {
+        sentinel = pkgsUnstable.buildNpmPackage {
           npmDepsHash = "sha256-/mC0aghYGdOx8xrUzk22oxo0Puh4t7IyjwGCFWl6LGY=";
           src = ./.;
           sourceRoot = "sentinel";
diff --git a/site/site.nix b/site/site.nix
index 8ec5240883..ea259faef6 100644
--- a/site/site.nix
+++ b/site/site.nix
@@ -4,12 +4,12 @@ _: {
       pkgs,
       lib,
       mkCi,
-      jsPkgs,
+      pkgsUnstable,
       ensureAtRepositoryRoot,
       ...
     }:
     let
-      deps = with jsPkgs; [
+      deps = with pkgsUnstable; [
         pkg-config
         nodePackages_latest.nodejs
       ];
@@ -18,7 +18,7 @@ _: {
     {
       packages = {
         site = mkCi false (
-          jsPkgs.buildNpmPackage {
+          pkgsUnstable.buildNpmPackage {
             npmDepsHash = "sha256-7d6a0+QgKn2xUvVU2jtWX2nGYynAb0nIrgnO/mOCAVs=";
             src = ./.;
             sourceRoot = "site";
diff --git a/tools/rust/crane.nix b/tools/rust/crane.nix
index a20ac0ce02..1d71060c4c 100644
--- a/tools/rust/crane.nix
+++ b/tools/rust/crane.nix
@@ -4,7 +4,6 @@
   perSystem =
     args@{
       pkgs,
-      unstablePkgs,
       rust,
       system,
       dbg,
@@ -13,7 +12,7 @@
       ...
     }:
     let
-      fs = unstablePkgs.lib.fileset;
+      fs = pkgs.lib.fileset;
 
       # clean up the lib namespace for what we actually need
       lib = args.lib // {
@@ -21,7 +20,7 @@
         inherit (args.lib.trivial) importTOML concat;
       };
 
-      craneLib = (inputs.crane.mkLib unstablePkgs).overrideToolchain (_: rust.toolchains.nightly);
+      craneLib = (inputs.crane.mkLib pkgs).overrideToolchain (_: rust.toolchains.nightly);
 
       # get the crane metadata out of the Cargo.toml. returns an empty attrset if if the table is not present.
       #
diff --git a/tools/tools.nix b/tools/tools.nix
index 9e4ab74f0c..8019958de6 100644
--- a/tools/tools.nix
+++ b/tools/tools.nix
@@ -2,7 +2,6 @@ _: {
   perSystem =
     {
       pkgs,
-      goPkgs,
       crane,
       ...
     }:
@@ -10,7 +9,7 @@ _: {
       packages = {
         inherit (crane.buildWorkspaceMember "tools/devnet-utils" { }) devnet-utils;
 
-        ignite-cli = goPkgs.buildGoModule {
+        ignite-cli = pkgs.buildGoModule {
           name = "ignite-cli";
           src = pkgs.fetchFromGitHub {
             owner = "ignite";
diff --git a/treefmt.nix b/treefmt.nix
index 551c70176a..cf081760f7 100644
--- a/treefmt.nix
+++ b/treefmt.nix
@@ -2,19 +2,16 @@
 {
   pkgs,
   rust,
-  jsPkgs,
+  pkgsUnstable,
   movefmt,
 }:
-let
-  unstablePkgs = jsPkgs;
-in
 {
-  package = unstablePkgs.treefmt;
+  package = pkgs.treefmt;
   projectRootFile = "treefmt.nix";
   programs = {
     gofmt = {
       enable = true;
-      package = unstablePkgs.go_1_23;
+      package = pkgs.go_1_23;
     };
     rustfmt = {
       enable = true;
@@ -23,31 +20,31 @@ in
     taplo.enable = true;
     biome = {
       enable = true;
-      package = unstablePkgs.biome;
+      package = pkgs.biome;
     };
     yamlfmt = {
       enable = true;
-      package = unstablePkgs.yamlfmt;
+      package = pkgs.yamlfmt;
     };
     mdformat = {
       enable = true;
-      package = unstablePkgs.mdformat;
+      package = pkgs.mdformat;
     };
     shellcheck = {
       enable = true;
-      package = unstablePkgs.shellcheck;
+      package = pkgs.shellcheck;
     };
     nixfmt-rfc-style = {
       enable = true;
-      package = unstablePkgs.nixfmt-rfc-style;
+      package = pkgs.nixfmt-rfc-style;
     };
     statix = {
       enable = true;
-      package = unstablePkgs.statix;
+      package = pkgs.statix;
     };
     deadnix = {
       enable = true;
-      package = unstablePkgs.deadnix;
+      package = pkgs.deadnix;
     };
   };
   settings = {
diff --git a/ts-sdk/ts-sdk.nix b/ts-sdk/ts-sdk.nix
index 4f14da962d..0a79aa9b9b 100644
--- a/ts-sdk/ts-sdk.nix
+++ b/ts-sdk/ts-sdk.nix
@@ -1,7 +1,7 @@
 _: {
   perSystem =
     {
-      jsPkgs,
+      pkgsUnstable,
       lib,
       self',
       ...
@@ -11,7 +11,7 @@ _: {
     in
     {
       packages = {
-        ts-sdk = jsPkgs.buildNpmPackage {
+        ts-sdk = pkgsUnstable.buildNpmPackage {
           pname = packageJson.name;
           inherit (packageJson) version;
           src = ./.;
@@ -25,11 +25,11 @@ _: {
       };
       apps.publish-ts-sdk = {
         type = "app";
-        program = jsPkgs.writeShellApplication {
+        program = pkgsUnstable.writeShellApplication {
           name = "publish-ts-sdk";
           text = ''
             cd ${self'.packages.ts-sdk}/lib/node_modules/@unionlabs/sdk
-            ${jsPkgs.nodejs}/bin/npm publish --access='public' --no-git-tagsh
+            ${pkgsUnstable.nodejs}/bin/npm publish --access='public' --no-git-tagsh
           '';
         };
 
diff --git a/typescript-sdk/typescript-sdk.nix b/typescript-sdk/typescript-sdk.nix
index 6588e7176f..63b6ffc780 100644
--- a/typescript-sdk/typescript-sdk.nix
+++ b/typescript-sdk/typescript-sdk.nix
@@ -2,7 +2,6 @@ _: {
   perSystem =
     {
       pkgs,
-      unstablePkgs,
       ensureAtRepositoryRoot,
       ...
     }:
@@ -10,7 +9,7 @@ _: {
       apps = {
         ts-sdk-publish = {
           type = "app";
-          program = unstablePkgs.writeShellApplication {
+          program = pkgs.writeShellApplication {
             name = "ts-sdk-publish";
             text = ''
               ${ensureAtRepositoryRoot}
@@ -36,7 +35,7 @@ _: {
         };
         ts-sdk-check = {
           type = "app";
-          program = unstablePkgs.writeShellApplication {
+          program = pkgs.writeShellApplication {
             name = "ts-sdk-check";
             text = ''
               ${ensureAtRepositoryRoot}
diff --git a/uniond/uniond.nix b/uniond/uniond.nix
index 6513981c88..aebce49ca4 100644
--- a/uniond/uniond.nix
+++ b/uniond/uniond.nix
@@ -7,14 +7,13 @@ _: {
       nix-filter,
       gitRev,
       uniondBundleVersions,
-      goPkgs,
       mkCi,
       dbg,
       ...
     }:
     let
       libwasmvm = self'.packages.libwasmvm-2_2_1;
-      CGO_LDFLAGS = "-z noexecstack -static -L${goPkgs.musl}/lib -L${libwasmvm}/lib -s -w";
+      CGO_LDFLAGS = "-z noexecstack -static -L${pkgs.musl}/lib -L${libwasmvm}/lib -s -w";
 
       mkUniondImage =
         uniond:
@@ -40,61 +39,59 @@ _: {
     {
       packages = {
         # Statically link on Linux using `pkgsStatic`, dynamically link on Darwin using normal `pkgs`.
-        uniond =
-          (if pkgs.stdenv.isLinux then goPkgs.pkgsStatic.buildGo123Module else goPkgs.buildGo123Module)
-            (
+        uniond = (if pkgs.stdenv.isLinux then pkgs.pkgsStatic.buildGo123Module else pkgs.buildGo123Module) (
+          {
+            name = "uniond";
+            src = nix-filter {
+              name = "uniond-source";
+              root = ./.;
+              exclude = [
+                (nix-filter.matchExt "nix")
+                (nix-filter.matchExt "md")
+              ];
+            };
+            vendorHash = "sha256-KcH/oRaV83ehsKVLGoDdc8NTkmGsqAybuIdib+cFCJo=";
+            doCheck = true;
+            meta.mainProgram = "uniond";
+          }
+          // (
+            if pkgs.stdenv.isLinux then
               {
-                name = "uniond";
-                src = nix-filter {
-                  name = "uniond-source";
-                  root = ./.;
-                  exclude = [
-                    (nix-filter.matchExt "nix")
-                    (nix-filter.matchExt "md")
-                  ];
-                };
-                vendorHash = "sha256-KcH/oRaV83ehsKVLGoDdc8NTkmGsqAybuIdib+cFCJo=";
-                doCheck = true;
-                meta.mainProgram = "uniond";
+                inherit CGO_LDFLAGS;
+                nativeBuildInputs = [
+                  pkgs.musl
+                ];
+                tags = [
+                  "netgo"
+                  "muslc"
+                ];
+                ldflags = [
+                  "-linkmode external"
+                  "-extldflags \"-Wl,-z,muldefs -static\""
+                  "-X github.com/cosmos/cosmos-sdk/version.Name=uniond"
+                  "-X github.com/cosmos/cosmos-sdk/version.AppName=uniond"
+                  "-X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo"
+                ];
               }
-              // (
-                if pkgs.stdenv.isLinux then
-                  {
-                    inherit CGO_LDFLAGS;
-                    nativeBuildInputs = [
-                      goPkgs.musl
-                    ];
-                    tags = [
-                      "netgo"
-                      "muslc"
-                    ];
-                    ldflags = [
-                      "-linkmode external"
-                      "-extldflags \"-Wl,-z,muldefs -static\""
-                      "-X github.com/cosmos/cosmos-sdk/version.Name=uniond"
-                      "-X github.com/cosmos/cosmos-sdk/version.AppName=uniond"
-                      "-X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo"
-                    ];
-                  }
-                else if pkgs.stdenv.isDarwin then
-                  {
-                    # Dynamically link if we're on darwin by wrapping the program
-                    # such that the DYLD_LIBRARY_PATH includes libwasmvm
-                    buildInputs = [ pkgs.makeWrapper ];
-                    postFixup = ''
-                      wrapProgram $out/ bin/uniond \
-                      --set DYLD_LIBRARY_PATH ${(pkgs.lib.makeLibraryPath [ libwasmvm ])};
-                    '';
-                    ldflags = [
-                      "-X github.com/cosmos/cosmos-sdk/version.Name=uniond"
-                      "-X github.com/cosmos/cosmos-sdk/version.AppName=uniond"
-                    ];
-                  }
-                else
-                  { }
-              )
+            else if pkgs.stdenv.isDarwin then
+              {
+                # Dynamically link if we're on darwin by wrapping the program
+                # such that the DYLD_LIBRARY_PATH includes libwasmvm
+                buildInputs = [ pkgs.makeWrapper ];
+                postFixup = ''
+                  wrapProgram $out/ bin/uniond \
+                  --set DYLD_LIBRARY_PATH ${(pkgs.lib.makeLibraryPath [ libwasmvm ])};
+                '';
+                ldflags = [
+                  "-X github.com/cosmos/cosmos-sdk/version.Name=uniond"
+                  "-X github.com/cosmos/cosmos-sdk/version.AppName=uniond"
+                ];
+              }
+            else
+              { }
+          )
 
-            );
+        );
 
         uniond-release = mkCi false (
           self'.packages.uniond.overrideAttrs (old: {
diff --git a/zkgm-dev/zkgm-dev.nix b/zkgm-dev/zkgm-dev.nix
index 576309809d..89f3b40d5e 100644
--- a/zkgm-dev/zkgm-dev.nix
+++ b/zkgm-dev/zkgm-dev.nix
@@ -3,12 +3,12 @@ _: {
     {
       lib,
       pkgs,
-      jsPkgs,
+      pkgsUnstable,
       ensureAtRepositoryRoot,
       ...
     }:
     let
-      deps = with jsPkgs; [
+      deps = with pkgsUnstable; [
         pkg-config
         python3
         nodePackages_latest.nodejs
@@ -17,7 +17,7 @@ _: {
     in
     {
       packages = {
-        zkgm-dev = jsPkgs.buildNpmPackage {
+        zkgm-dev = pkgsUnstable.buildNpmPackage {
           npmDepsHash = "sha256-zHh5qqZMYuXqyMFs5BgAMdQGwW6oNlEwrZIJZYyqSaw=";
           src = ./.;
           sourceRoot = "zkgm-dev";