diff --git a/flake.lock b/flake.lock
index 85b4086..d9b8528 100644
--- a/flake.lock
+++ b/flake.lock
@@ -158,11 +158,11 @@
     },
     "capkgs": {
       "locked": {
-        "lastModified": 1733159898,
-        "narHash": "sha256-gGmCVB1JZY2kvX75nwMhvr5e16EhVESA/beiuhKVmV0=",
+        "lastModified": 1733419103,
+        "narHash": "sha256-foiusZ6R0GxmiEwNBOr8lcY3jYnUDYiWnKw9FP07bE0=",
         "owner": "input-output-hk",
         "repo": "capkgs",
-        "rev": "91c14ee26a3d0dd1ae0fa7153d6a6f6244e44e68",
+        "rev": "6ec8b27301d86ee9f4b46d179a1fa71c800432e7",
         "type": "github"
       },
       "original": {
@@ -241,16 +241,15 @@
     "cardano-node-service": {
       "flake": false,
       "locked": {
-        "lastModified": 1732127807,
-        "narHash": "sha256-YKyaF31DeHkHcBiA8jjQJxM3R6clsqd0j8RWMg0QKbk=",
+        "lastModified": 1733261293,
+        "narHash": "sha256-JaqXZDH//3a0RRCOpa6FpPdRhNV8qqcnej6hxyqTcEQ=",
         "owner": "IntersectMBO",
         "repo": "cardano-node",
-        "rev": "d06275ba16f68b4295945ff11b6531373c885574",
+        "rev": "16c4484243e074aab8850a10625ada86df7c1597",
         "type": "github"
       },
       "original": {
         "owner": "IntersectMBO",
-        "ref": "jl/10.1.2-svc-legacy-tracing",
         "repo": "cardano-node",
         "type": "github"
       }
@@ -258,16 +257,15 @@
     "cardano-node-service-ng": {
       "flake": false,
       "locked": {
-        "lastModified": 1732127807,
-        "narHash": "sha256-YKyaF31DeHkHcBiA8jjQJxM3R6clsqd0j8RWMg0QKbk=",
+        "lastModified": 1733261293,
+        "narHash": "sha256-JaqXZDH//3a0RRCOpa6FpPdRhNV8qqcnej6hxyqTcEQ=",
         "owner": "IntersectMBO",
         "repo": "cardano-node",
-        "rev": "d06275ba16f68b4295945ff11b6531373c885574",
+        "rev": "16c4484243e074aab8850a10625ada86df7c1597",
         "type": "github"
       },
       "original": {
         "owner": "IntersectMBO",
-        "ref": "jl/10.1.2-svc-legacy-tracing",
         "repo": "cardano-node",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index f082997..8bc7aaf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,12 +58,12 @@
     };
 
     cardano-node-service = {
-      url = "github:IntersectMBO/cardano-node/jl/10.1.2-svc-legacy-tracing";
+      url = "github:IntersectMBO/cardano-node";
       flake = false;
     };
 
     cardano-node-service-ng = {
-      url = "github:IntersectMBO/cardano-node/jl/10.1.2-svc-legacy-tracing";
+      url = "github:IntersectMBO/cardano-node";
       flake = false;
     };
 
diff --git a/flakeModules/pkgs.nix b/flakeModules/pkgs.nix
index 052c90d..4f8bf38 100644
--- a/flakeModules/pkgs.nix
+++ b/flakeModules/pkgs.nix
@@ -39,6 +39,8 @@
 #   perSystem.cardano-parts.pkgs.cardano-smash-ng
 #   perSystem.cardano-parts.pkgs.cardano-submit-api
 #   perSystem.cardano-parts.pkgs.cardano-submit-api-ng
+#   perSystem.cardano-parts.pkgs.cardano-testnet
+#   perSystem.cardano-parts.pkgs.cardano-testnet-ng
 #   perSystem.cardano-parts.pkgs.cardano-tracer
 #   perSystem.cardano-parts.pkgs.cardano-wallet
 #   perSystem.cardano-parts.pkgs.cc-sign
@@ -445,6 +447,8 @@ in
             (mkPkg "cardano-smash-ng" caPkgs.cardano-smash-server-no-basic-auth-input-output-hk-cardano-db-sync-13-6-0-4-0b7c281)
             (mkPkg "cardano-submit-api" caPkgs."cardano-submit-api-input-output-hk-cardano-node-10-1-3-36871ba")
             (mkPkg "cardano-submit-api-ng" caPkgs."cardano-submit-api-input-output-hk-cardano-node-10-1-3-36871ba")
+            (mkPkg "cardano-testnet" caPkgs."cardano-testnet-input-output-hk-cardano-node-10-1-3-36871ba")
+            (mkPkg "cardano-testnet-ng" caPkgs."cardano-testnet-input-output-hk-cardano-node-10-1-3-36871ba")
             (mkPkg "cardano-tracer" caPkgs."cardano-tracer-input-output-hk-cardano-node-10-1-3-36871ba")
             (mkPkg "cardano-tracer-ng" caPkgs."cardano-tracer-input-output-hk-cardano-node-10-1-3-36871ba")
             (mkPkg "cardano-wallet" (caPkgs.cardano-wallet-cardano-foundation-cardano-wallet-v2024-11-18-9eb5f59
@@ -465,9 +469,9 @@ in
             (mkPkg "metadata-validator-github" caPkgs.metadata-validator-github-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d)
             (mkPkg "metadata-webhook" caPkgs.metadata-webhook-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d)
             (mkPkg "mithril-client-cli" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-2445-0-pre-67dc6e4 {meta.mainProgram = "mithril-client";}))
-            (mkPkg "mithril-client-cli-ng" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-unstable-e6922b8 {meta.mainProgram = "mithril-client";}))
+            (mkPkg "mithril-client-cli-ng" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-unstable-490e2c9 {meta.mainProgram = "mithril-client";}))
             (mkPkg "mithril-signer" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-2445-0-pre-67dc6e4 {meta.mainProgram = "mithril-signer";}))
-            (mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-unstable-e6922b8 {meta.mainProgram = "mithril-signer";}))
+            (mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-unstable-490e2c9 {meta.mainProgram = "mithril-signer";}))
             (mkPkg "orchestrator-cli" caPkgs.orchestrator-cli-IntersectMBO-credential-manager-0-1-2-0-081cc8c)
             (mkPkg "token-metadata-creator" (recursiveUpdate caPkgs.token-metadata-creator-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d {meta.mainProgram = "token-metadata-creator";}))
             (mkPkg "tx-bundle" caPkgs.tx-bundle-IntersectMBO-credential-manager-0-1-2-0-081cc8c)
@@ -498,6 +502,7 @@ in
               cardano-ogmios
               cardano-smash
               cardano-submit-api
+              cardano-testnet
               cardano-tracer
               cardano-wallet
               db-analyser
@@ -523,6 +528,7 @@ in
             cardano-node-ng = mkWrapper "cardano-node-ng" cfgPkgs.cardano-node-ng;
             cardano-smash-ng = mkWrapper "cardano-smash-ng" cfgPkgs.cardano-smash-ng;
             cardano-submit-api-ng = mkWrapper "cardano-submit-api-ng" cfgPkgs.cardano-submit-api-ng;
+            cardano-testnet-ng = mkWrapper "cardano-testnet-ng" cfgPkgs.cardano-testnet-ng;
             cardano-tracer-ng = mkWrapper "cardano-tracer-ng" cfgPkgs.cardano-tracer-ng;
             db-analyser-ng = mkWrapper "db-analyser-ng" cfgPkgs.db-analyser-ng;
             db-synthesizer-ng = mkWrapper "db-synthesizer-ng" cfgPkgs.db-synthesizer-ng;
diff --git a/flakeModules/shell.nix b/flakeModules/shell.nix
index bcfda0e..8e99b72 100644
--- a/flakeModules/shell.nix
+++ b/flakeModules/shell.nix
@@ -293,6 +293,7 @@ in
                         cardano-address
                         cardano-cli
                         cardano-node
+                        cardano-testnet
                         cardano-wallet
                         db-analyser
                         db-synthesizer
@@ -303,6 +304,7 @@ in
                         # the wrapped binary to avoid cli name collision.
                         self'.packages.cardano-cli-ng
                         self'.packages.cardano-node-ng
+                        self'.packages.cardano-testnet-ng
                         self'.packages.db-analyser-ng
                         self'.packages.db-synthesizer-ng
                         self'.packages.db-truncater-ng