diff --git a/deku-p/deku-toolkit/package.json b/deku-p/deku-toolkit/package.json
index e9c3518d50..bb717ae4cd 100644
--- a/deku-p/deku-toolkit/package.json
+++ b/deku-p/deku-toolkit/package.json
@@ -19,7 +19,7 @@
   ],
   "author": "contact@marigold.dev",
   "license": "ISC",
-  "devDependencies": {
+  "dependencies": {
     "typescript": "^4.7.4",
     "@types/bs58check": "^2.1.0",
     "@types/node": "^18.7.13",
@@ -29,9 +29,7 @@
     "rollup": "^2.79.1",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-sourcemaps": "^0.6.3",
-    "rollup-plugin-typescript2": "^0.34.0"
-  },
-  "dependencies": {
+    "rollup-plugin-typescript2": "^0.34.0",
     "@tzstamp/helpers": "^0.3.4",
     "@taquito/taquito": "^13.0.1",
     "blakejs": "^1.2.1",
diff --git a/deku-p/src/core/bin/node/dune b/deku-p/src/core/bin/node/dune
index ea9fb45915..21ea91ef28 100644
--- a/deku-p/src/core/bin/node/dune
+++ b/deku-p/src/core/bin/node/dune
@@ -17,8 +17,7 @@
   fmt.cli
   logs.cli
   logs.threaded
-  piaf
-  routes)
+  piaf)
  (preprocess
   (pps ppx_let_binding ppx_deriving_cmdliner ppx_yojson_conv)))
 
diff --git a/dune b/dune
index 4b7fd96a00..612f6de3ff 100644
--- a/dune
+++ b/dune
@@ -1,4 +1,4 @@
-(data_only_dirs flextesa_chain node_modules)
+(data_only_dirs flextesa_chain node_modules nix)
 
 (env
  (static
diff --git a/flake.nix b/flake.nix
index 8bc6cef2da..a5be7e367d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,6 +81,25 @@
             tuna = self'.packages.tuna;
             deploy-rs = deploy-rs.packages.${system}.default;
           };
+          checks = {
+            ensure_all_build = pkgs.symlinkJoin {
+              name = "all";
+              paths = with self';
+              with packages; [
+                packages."@marigold-dev/deku-c-toolkit"
+                packages."@marigold-dev/deku-p-sdk"
+                packages."@marigold-dev/deku-toolkit"
+                decookies-vm
+                deku
+                deku-static
+                deku-toolkit-nodejs-example
+                deku-toolkit-react-example
+                docker
+                tuna
+                website
+              ];
+            };
+          };
         };
       };
       flake = {
diff --git a/networks/betanets/fleet.nix b/networks/betanets/fleet.nix
index c94e50724f..4ead71c892 100644
Binary files a/networks/betanets/fleet.nix and b/networks/betanets/fleet.nix differ
diff --git a/networks/betanets/modules/promtail.nix b/networks/betanets/modules/promtail.nix
index 0be5ef6082..cae4a8a16f 100644
Binary files a/networks/betanets/modules/promtail.nix and b/networks/betanets/modules/promtail.nix differ
diff --git a/nix/deku-c/tuna.nix b/nix/deku-c/tuna.nix
index 88ccd9752b..dd645603a2 100644
--- a/nix/deku-c/tuna.nix
+++ b/nix/deku-c/tuna.nix
@@ -1,18 +1,39 @@
-{
-  nix-filter,
-  lib,
-  buildDunePackage,
-  zarith,
-  ppx_deriving,
-  ppx_yojson_conv,
-  yojson,
-  wasm,
-  data-encoding,
-  tezos-micheline,
-  core,
-  core_unix,
-  ppx_jane,
-  alcotest,
+{ nix-filter
+, lib
+, buildDunePackage
+# This is probably a super set of what is actually needed
+# TODO: maybe we should figure out how to re-use deku.nix?
+, eio
+, eio_main
+, zarith
+, ppx_deriving
+, ppx_yojson_conv
+, data-encoding
+, wasm
+, tezos-micheline
+, ppx_deriving_cmdliner
+, mirage-crypto
+, mirage-crypto-ec
+, mirage-crypto-rng
+, digestif
+, tezos-crypto
+, secp256k1-internal
+, piaf
+, cmdliner
+, ppx_blob
+, caqti
+, caqti-driver-sqlite3
+, dream
+, caqti-eio
+, routes
+, ppx_rapper
+, ppx_rapper_eio
+, ezgzip
+, ppx_jane # TODO: do we need this?
+, core
+, core_unix
+, yojson
+, alcotest
 }:
 buildDunePackage rec {
   pname = "deku";
@@ -24,17 +45,59 @@ buildDunePackage rec {
       include = [
         "deku.opam"
         "deku-c/tunac"
+        "deku-c/interpreter"
+        "deku-c/wasm-vm-ocaml"
+        # TODO: why isn't tuna part of the deku build? Seems like we duplicate stuff here.
+        "deku-p/src/core"
         "dune-project"
       ];
+      exclude = [
+        "deku-p/src/core/bin"
+      ];
     };
 
   propagatedBuildInputs = [
+    eio
+    eio_main
     zarith
     ppx_deriving
     ppx_yojson_conv
     data-encoding
     wasm
     tezos-micheline
+    ppx_deriving_cmdliner
+    mirage-crypto
+    mirage-crypto-ec
+    mirage-crypto-rng
+    digestif
+    tezos-micheline
+    tezos-crypto
+    ppx_deriving
+    ppx_yojson_conv
+    zarith
+    digestif
+    mirage-crypto
+    mirage-crypto-ec
+    mirage-crypto-rng
+    secp256k1-internal
+    piaf
+    cmdliner
+    ppx_blob
+    data-encoding
+    caqti
+    caqti-driver-sqlite3
+    ppx_deriving_cmdliner
+    dream
+    eio
+    eio_main
+    caqti-eio
+    routes
+    ppx_rapper
+    ppx_rapper_eio
+    ezgzip
+    ppx_jane # TODO: do we need this?
+    core
+    core_unix
   ];
 
   buildInputs = [
diff --git a/nix/deku-p/deku.nix b/nix/deku-p/deku.nix
index 40603f60a9..4567485325 100644
--- a/nix/deku-p/deku.nix
+++ b/nix/deku-p/deku.nix
@@ -88,6 +88,7 @@ in
           ppx_deriving_cmdliner
           dream
           eio
+          eio_main
           caqti-eio
           routes
           ppx_rapper
diff --git a/website/package.json b/website/package.json
index 32c7432e40..92019541f4 100644
--- a/website/package.json
+++ b/website/package.json
@@ -35,7 +35,6 @@
     "@taquito/michelson-encoder": "^14.0.0",
     "@taquito/remote-signer": "^14.0.0",
     "@taquito/rpc": "^14.0.0",
-    "@taquito/sapling": "^14.0.0",
     "@taquito/signer": "^14.0.0",
     "@taquito/taquito": "^14.0.0",
     "@taquito/tezbridge-wallet": "^14.0.0",
diff --git a/yarn.lock b/yarn.lock
index 0e1bfc0889..b452995223 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4094,9 +4094,19 @@
   version "0.1.12"
   dependencies:
     "@taquito/taquito" "^13.0.1"
+    "@types/bs58check" "^2.1.0"
+    "@types/node" "^18.7.13"
+    "@typescript-eslint/eslint-plugin" "^5.35.1"
+    "@typescript-eslint/parser" "^5.35.1"
     "@tzstamp/helpers" "^0.3.4"
     blakejs "^1.2.1"
     bs58check "^2.1.2"
+    eslint "^8.23.0"
+    rollup "^2.79.1"
+    rollup-plugin-json "^4.0.0"
+    rollup-plugin-sourcemaps "^0.6.3"
+    rollup-plugin-typescript2 "^0.34.0"
+    typescript "^4.7.4"
 
 "@mdx-js/mdx@^1.6.22":
   version "1.6.22"