diff --git a/Cargo.lock b/Cargo.lock
index c14265e5..d20b6437 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3503,8 +3503,9 @@ dependencies = [
 
 [[package]]
 name = "holochain_client"
-version = "0.6.0-dev.8"
-source = "git+https://github.com/holochain/holochain-client-rust?branch=develop#81a6bf88bfa28fca2e6a513ede1719791e87e124"
+version = "0.6.0-dev.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1d5d226f3433ad257cb19de1f355ca101e1a3571dc4fded8a20f38799b8e2bf"
 dependencies = [
  "again",
  "anyhow",
@@ -7748,7 +7749,7 @@ dependencies = [
  "tokio-rustls 0.25.0",
  "tokio-tungstenite",
  "tracing",
- "webpki-roots 0.26.5",
+ "webpki-roots 0.26.6",
 ]
 
 [[package]]
@@ -10558,9 +10559,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
 dependencies = [
  "rustls-pki-types",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 40833276..8b5bf143 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,3 @@
 members = ["crates/*", "nix/reference-tauri-happ"]
 resolver = "2"
 exclude = [ "examples/end-user-happ", "examples/holochain-runtime" ]
-
-[patch.crates-io]
-holochain_client = { git ="https://github.com/holochain/holochain-client-rust",branch="develop" }
diff --git a/examples/end-user-happ/Cargo.lock b/examples/end-user-happ/Cargo.lock
index bcfecfb6..f210bf34 100644
--- a/examples/end-user-happ/Cargo.lock
+++ b/examples/end-user-happ/Cargo.lock
@@ -3394,8 +3394,9 @@ dependencies = [
 
 [[package]]
 name = "holochain_client"
-version = "0.6.0-dev.8"
-source = "git+https://github.com/holochain/holochain-client-rust?branch=develop#81a6bf88bfa28fca2e6a513ede1719791e87e124"
+version = "0.6.0-dev.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1d5d226f3433ad257cb19de1f355ca101e1a3571dc4fded8a20f38799b8e2bf"
 dependencies = [
  "again",
  "anyhow",
@@ -7452,7 +7453,7 @@ dependencies = [
  "tokio-rustls 0.25.0",
  "tokio-tungstenite",
  "tracing",
- "webpki-roots 0.26.5",
+ "webpki-roots 0.26.6",
 ]
 
 [[package]]
@@ -10172,9 +10173,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
 dependencies = [
  "rustls-pki-types",
 ]
diff --git a/examples/end-user-happ/Cargo.toml b/examples/end-user-happ/Cargo.toml
index 1b9d1222..964b5a4f 100644
--- a/examples/end-user-happ/Cargo.toml
+++ b/examples/end-user-happ/Cargo.toml
@@ -19,5 +19,3 @@ path = "dnas/forum/zomes/coordinator/posts"
 [workspace.dependencies.posts_integrity]
 path = "dnas/forum/zomes/integrity/posts"
 
-[patch.crates-io]
-holochain_client = { git ="https://github.com/holochain/holochain-client-rust",branch="develop" }
diff --git a/examples/end-user-happ/flake.lock b/examples/end-user-happ/flake.lock
index 3dd3c61f..59d89730 100644
--- a/examples/end-user-happ/flake.lock
+++ b/examples/end-user-happ/flake.lock
@@ -4,7 +4,10 @@
       "inputs": {
         "devshell": "devshell",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "p2p-shipyard",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1720988234,
@@ -179,22 +182,6 @@
         "type": "github"
       }
     },
-    "gradlenixpkgs": {
-      "locked": {
-        "lastModified": 1726447378,
-        "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "hc-infra": {
       "inputs": {
         "crane": [
@@ -419,7 +406,7 @@
         "hc-scaffold": "hc-scaffold_2",
         "holochain": "holochain_2",
         "lair-keystore": "lair-keystore_2",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
@@ -444,7 +431,7 @@
         "hc-scaffold": "hc-scaffold_3",
         "holochain": "holochain_3",
         "lair-keystore": "lair-keystore_3",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
@@ -565,22 +552,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1720768451,
-        "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1717179513,
         "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
@@ -596,7 +567,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1717179513,
         "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
@@ -620,7 +591,6 @@
           "holonix",
           "crane"
         ],
-        "gradlenixpkgs": "gradlenixpkgs",
         "hc-infra": "hc-infra",
         "holonix": "holonix_3",
         "nixpkgs": [
@@ -637,7 +607,7 @@
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-4rwcpFntEJskRZ6pPYWOuwOXrj+CiSrK6L3vCA5fNzo=",
+        "narHash": "sha256-DugEunJ/8Hs52ZlqvMZD3DCqwUanwy0qWx5Jfp3QrEA=",
         "path": "../..",
         "type": "path"
       },