diff --git a/flake.lock b/flake.lock
index 87f1414..a526efa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -484,11 +484,11 @@
         "versions": "versions"
       },
       "locked": {
-        "lastModified": 1721404544,
-        "narHash": "sha256-NLfWhXkL9mIg58IXoI4WwpV3z1e1lmyUqXuOWlS9BIA=",
+        "lastModified": 1722597610,
+        "narHash": "sha256-dqfj/C1sIAjAkN8p01FWwUZyKfFUaCtf/Mvxp+7kdDM=",
         "owner": "holochain-open-dev",
         "repo": "infrastructure",
-        "rev": "afc1fa6492ae1c2e9056da1808f1d8cd877a65d8",
+        "rev": "75bb179e00ea0426b623962910c1dc6f4bc46d73",
         "type": "github"
       },
       "original": {
@@ -660,11 +660,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721413603,
-        "narHash": "sha256-LrSUS7RQ4NiWTlaZ3QR8gdcOUdT+vfPcZVkOfG73tPM=",
+        "lastModified": 1722598765,
+        "narHash": "sha256-k4SYTJlMvrJRefEuUmITdXbsVzd5vjmw4Wl/U9bYYb0=",
         "owner": "holochain",
         "repo": "holochain",
-        "rev": "d36925c84609a36303c3b6439d03d07c46e71078",
+        "rev": "2bda9c4dc68acf467022833911e3c1d76073f3d4",
         "type": "github"
       },
       "original": {
@@ -676,16 +676,16 @@
     "holochain_4": {
       "flake": false,
       "locked": {
-        "lastModified": 1718142789,
-        "narHash": "sha256-Lam1hWLqi+zv0umdTIIHK9YKHVWQrI/Z4AySo97xK9E=",
+        "lastModified": 1722347117,
+        "narHash": "sha256-Jv4DxaVtdbO+fOD4woFoepCCOtRN/HF94xJSwViz3ck=",
         "owner": "holochain",
         "repo": "holochain",
-        "rev": "582f05b66b690448b1574d1aa6004114ff98187f",
+        "rev": "97d86050b177829b623461970db5c3b64fbd74c1",
         "type": "github"
       },
       "original": {
         "owner": "holochain",
-        "ref": "holochain-0.3.1",
+        "ref": "holochain-0.3.2",
         "repo": "holochain",
         "type": "github"
       }
@@ -727,16 +727,16 @@
     "lair_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1709335027,
-        "narHash": "sha256-rKMhh7TLuR1lqze2YFWZCGYKZQoB4dZxjpX3sb7r7Jk=",
+        "lastModified": 1717684904,
+        "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=",
         "owner": "holochain",
         "repo": "lair",
-        "rev": "826be915efc839d1d1b8a2156b158999b8de8d5b",
+        "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066",
         "type": "github"
       },
       "original": {
         "owner": "holochain",
-        "ref": "lair_keystore-v0.4.4",
+        "ref": "lair_keystore-v0.4.5",
         "repo": "lair",
         "type": "github"
       }
@@ -938,11 +938,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1721138476,
-        "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=",
+        "lastModified": 1722062969,
+        "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206",
+        "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
         "type": "github"
       },
       "original": {
@@ -974,16 +974,17 @@
         "versions": "versions_2"
       },
       "locked": {
-        "lastModified": 1722014060,
-        "narHash": "sha256-Bm2FdGFkBjwjZFfpe8x9So/n0RhGz6JliRSTRhQgWrY=",
-        "owner": "darksoil-studio",
+        "lastModified": 1722713399,
+        "narHash": "sha256-6GTEF9vBQehS3tSg6RHQYCj6wPWaixKLniDk2RUDss4=",
+        "owner": "mattyg",
         "repo": "p2p-shipyard",
-        "rev": "da6be8eea8deb135cbf196f69982a9e95b80c34d",
+        "rev": "f3fc0d25bea41411d0347a5f381f91d5d3e9e572",
         "type": "github"
       },
       "original": {
-        "owner": "darksoil-studio",
+        "owner": "mattyg",
         "repo": "p2p-shipyard",
+        "rev": "f3fc0d25bea41411d0347a5f381f91d5d3e9e572",
         "type": "github"
       }
     },
@@ -1139,11 +1140,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721355572,
-        "narHash": "sha256-I4TQ2guV9jTmZsXeWt5HMojcaqNZHII4zu0xIKZEovM=",
+        "lastModified": 1722133294,
+        "narHash": "sha256-XKSVN+lmjVEFPjMa5Ui0VTay2Uvqa74h0MQT0HU1pqw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "d5bc7b1b21cf937fb8ff108ae006f6776bdb163d",
+        "rev": "9803f6e04ca37a2c072783e8297d2080f8d0e739",
         "type": "github"
       },
       "original": {
@@ -1172,11 +1173,11 @@
     "scaffolding_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1721322247,
-        "narHash": "sha256-HtYc28vwS2+YzgE5ZHq+U9vg0W1/mvFblGkLUhMx5wA=",
+        "lastModified": 1722439136,
+        "narHash": "sha256-TlCogFMYSZtep5AhG7IrMDxq0Grze2B5LL59+j6am1E=",
         "owner": "holochain",
         "repo": "scaffolding",
-        "rev": "fa5f502eed7fe4438105e0cca6c22f8eed999c52",
+        "rev": "19567b5b2ac550216b3a1479893acf3f734921b4",
         "type": "github"
       },
       "original": {
@@ -1265,11 +1266,11 @@
       },
       "locked": {
         "dir": "versions/0_3",
-        "lastModified": 1721413603,
-        "narHash": "sha256-LrSUS7RQ4NiWTlaZ3QR8gdcOUdT+vfPcZVkOfG73tPM=",
+        "lastModified": 1722598765,
+        "narHash": "sha256-k4SYTJlMvrJRefEuUmITdXbsVzd5vjmw4Wl/U9bYYb0=",
         "owner": "holochain",
         "repo": "holochain",
-        "rev": "d36925c84609a36303c3b6439d03d07c46e71078",
+        "rev": "2bda9c4dc68acf467022833911e3c1d76073f3d4",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5a52f02..38960cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,7 @@
   description = "Template for Holochain app development";
 
   inputs = {
-    p2p-shipyard.url = "github:darksoil-studio/p2p-shipyard";
-
+    p2p-shipyard.url = "github:mattyg/p2p-shipyard?rev=f3fc0d25bea41411d0347a5f381f91d5d3e9e572";
     versions.url  = "github:holochain/holochain?dir=versions/0_3";
 
     holochain-flake.url = "github:holochain/holochain";
diff --git a/package-lock.json b/package-lock.json
index 02739df..ac3213e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
       },
       "devDependencies": {
         "@holochain-playground/cli": "^0.1.1",
-        "@holochain/hc-spin": "^0.400.0-dev.0",
+        "@holochain/hc-spin": "^0.300.3",
         "@lightningrodlabs/we-dev-cli": "^0.12.0-dev.6",
         "@rollup/plugin-typescript": "^8.0.0",
         "@tauri-apps/cli": "^2.0.0-beta.22",
@@ -757,14 +757,14 @@
       }
     },
     "node_modules/@holochain/hc-spin": {
-      "version": "0.400.0-dev.2",
-      "resolved": "https://registry.npmjs.org/@holochain/hc-spin/-/hc-spin-0.400.0-dev.2.tgz",
-      "integrity": "sha512-CaJCjvWSaQnEAWf6/qeMSQkIpybJ6CEYDd9VkNYIWrYPhNd2qmUDbZvRl0Uakr8D+S3l8oh96CqSLMRqnwPzfA==",
+      "version": "0.300.3",
+      "resolved": "https://registry.npmjs.org/@holochain/hc-spin/-/hc-spin-0.300.3.tgz",
+      "integrity": "sha512-VGKT/jK1miLAMaqsvlhk+k4AAqOOnU0yh7sWmOwKHA6grpDCL9G8f2+J0rxDTx9T9STOgLmqa9KBWDH7kkHpqA==",
       "dev": true,
       "dependencies": {
         "@electron-toolkit/preload": "^3.0.0",
         "@electron-toolkit/utils": "^3.0.0",
-        "@holochain/client": "0.18.0-dev.0",
+        "@holochain/client": "0.17.0-rc.0",
         "@holochain/hc-spin-rust-utils": "^0.300.1",
         "@msgpack/msgpack": "^2.8.0",
         "bufferutil": "4.0.8",
@@ -859,9 +859,9 @@
       }
     },
     "node_modules/@holochain/hc-spin/node_modules/@holochain/client": {
-      "version": "0.18.0-dev.0",
-      "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.18.0-dev.0.tgz",
-      "integrity": "sha512-xQ4J5rG+t1aJrtzZK8BsJYLsYHgG4zoUvsmoUuiKZcvVRlxPldX+p6rWYWz0JuDxlTE5hjmJmBTPWXd+WVHGNw==",
+      "version": "0.17.0-rc.0",
+      "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.0-rc.0.tgz",
+      "integrity": "sha512-DyoAe6Gf7Atpn5f+WO8Lj08G4Vfu5p5U9PuUlOkm5gjfwTxHU6rOTAmdEWz1QcA2Yne3cmUj+qqpofTSVqB/Eg==",
       "dev": true,
       "dependencies": {
         "@bitgo/blake2b": "^3.2.4",
diff --git a/package.json b/package.json
index e20885e..0aeac62 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@lightningrodlabs/we-dev-cli": "^0.12.0-dev.6",
-    "@holochain/hc-spin": "^0.400.0-dev.0",
+    "@holochain/hc-spin": "^0.300.3",
     "@holochain-playground/cli": "^0.1.1",
     "@rollup/plugin-typescript": "^8.0.0",
     "@tsconfig/svelte": "^2.0.0",