diff --git a/package-lock.json b/package-lock.json
index 9a63dfb9..6f583001 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44795,7 +44795,7 @@
       "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz",
       "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="
     },
-    "node_modules/tools": {
+    "node_modules/@pythnetwork/cosmwasm-deploy-tools": {
       "resolved": "target_chains/cosmwasm/tools",
       "link": true
     },
@@ -90015,7 +90015,7 @@
       "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz",
       "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="
     },
-    "tools": {
+    "@pythnetwork/cosmwasm-deploy-tools": {
       "version": "file:target_chains/cosmwasm/tools",
       "requires": {
         "@cosmjs/cosmwasm-stargate": "^0.29.5",
diff --git a/target_chains/cosmwasm/tools/package.json b/target_chains/cosmwasm/tools/package.json
index da1890fa..8fcdca5b 100644
--- a/target_chains/cosmwasm/tools/package.json
+++ b/target_chains/cosmwasm/tools/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "tools",
+  "name": "@pythnetwork/cosmwasm-deploy-tools",
   "version": "1.0.0",
   "description": "",
   "main": "deploy-pyth-bridge.ts",
diff --git a/target_chains/ethereum/contracts/foundry.toml b/target_chains/ethereum/contracts/foundry.toml
index b4ffec58..624b10f2 100644
--- a/target_chains/ethereum/contracts/foundry.toml
+++ b/target_chains/ethereum/contracts/foundry.toml
@@ -1,7 +1,7 @@
 [profile.default]
 solc_version = '0.8.4'
 optimizer = true
-optimizer_runs = 10000
+optimizer_runs = 5000
 src = 'contracts'
 # We put the tests into the forge-test directory (instead of test) so that
 # truffle doesn't try to build them
diff --git a/target_chains/ethereum/contracts/truffle-config.js b/target_chains/ethereum/contracts/truffle-config.js
index 98fbc9a6..bcf3462a 100644
--- a/target_chains/ethereum/contracts/truffle-config.js
+++ b/target_chains/ethereum/contracts/truffle-config.js
@@ -271,7 +271,7 @@ module.exports = {
       settings: {
         optimizer: {
           enabled: true,
-          runs: 10000,
+          runs: 5000,
         },
       },
     },
diff --git a/target_chains/sui/contracts/sources/pyth.move b/target_chains/sui/contracts/sources/pyth.move
index 72c6eaf6..df5d93ce 100644
--- a/target_chains/sui/contracts/sources/pyth.move
+++ b/target_chains/sui/contracts/sources/pyth.move
@@ -963,7 +963,7 @@ module pyth::pyth_tests{
         price_info_object_1 = vector::pop_back(&mut price_info_object_vec);
 
         vector::destroy_empty(price_info_object_vec);
-        
+
         let current_price_info = price_info::get_price_info_from_price_info_object(&price_info_object_1);
         let current_price_feed = price_info::get_price_feed(&current_price_info);
         let current_price = price_feed::get_price(current_price_feed);
diff --git a/tilt_devnet/docker_images/Dockerfile.cosmwasm b/tilt_devnet/docker_images/Dockerfile.cosmwasm
index b713d683..b3001825 100644
--- a/tilt_devnet/docker_images/Dockerfile.cosmwasm
+++ b/tilt_devnet/docker_images/Dockerfile.cosmwasm
@@ -25,16 +25,21 @@ COPY wormhole_attester/sdk/rust /wormhole_attester/sdk/rust
 RUN --mount=type=cache,target=/code/target,id=cosmwasm_pyth_target --mount=type=cache,target=/usr/local/cargo/registry optimize_workspace.sh
 
 # Contract deployment stage
-FROM node:16-buster-slim@sha256:93c9fc3550f5f7d159f282027228e90e3a7f8bf38544758024f005e82607f546
+FROM lerna
 
+USER root
 RUN apt update && apt install netcat curl jq -y
 
-WORKDIR /app/tools
+USER 1000
 
-COPY --from=wormhole_builder /code/artifacts/wormhole.wasm /app/artifacts/wormhole.wasm
-COPY --from=pyth_builder /code/artifacts/pyth_cosmwasm.wasm /app/artifacts/pyth_cosmwasm.wasm
+COPY --from=wormhole_builder /code/artifacts/wormhole.wasm /home/node/target_chains/cosmwasm/artifacts/wormhole.wasm
+COPY --from=pyth_builder /code/artifacts/pyth_cosmwasm.wasm /home/node/target_chains/cosmwasm/artifacts/pyth_cosmwasm.wasm
 
-COPY target_chains/cosmwasm/tools/package.json target_chains/cosmwasm/tools/package-lock.json /app/tools/
-RUN --mount=type=cache,uid=1000,gid=1000,target=/home/node/.npm \
-    npm ci
-COPY target_chains/cosmwasm/tools /app/tools
+WORKDIR /home/node/
+
+COPY --chown=1000:1000 governance/xc_governance_sdk_js governance/xc_governance_sdk_js
+COPY --chown=1000:1000 target_chains/cosmwasm/tools target_chains/cosmwasm/tools
+
+RUN npx lerna run build --scope="@pythnetwork/cosmwasm-deploy-tools" --include-dependencies
+
+WORKDIR /home/node/target_chains/cosmwasm/tools
diff --git a/tilt_devnet/k8s/terra-devnet.yaml b/tilt_devnet/k8s/terra-devnet.yaml
index 7a0f5d27..4fe8917c 100644
--- a/tilt_devnet/k8s/terra-devnet.yaml
+++ b/tilt_devnet/k8s/terra-devnet.yaml
@@ -77,13 +77,14 @@ spec:
           command:
             - /bin/sh
             - -c
-            - "sh /app/tools/deploy.sh && touch /app/tools/success && sleep infinity"
+            - "sh /home/node/target_chains/cosmwasm/tools/deploy.sh &&
+              touch /home/node/success && sleep infinity"
           readinessProbe:
             exec:
               command:
                 - test
                 - -e
-                - "/app/tools/success"
+                - "/home/node/success"
             initialDelaySeconds: 5
             periodSeconds: 5
       restartPolicy: Always