diff --git a/scripts/wasmd/contracts/checksums.sha256 b/scripts/wasmd/contracts/checksums.sha256
index d31818e8..a7afcb40 100644
--- a/scripts/wasmd/contracts/checksums.sha256
+++ b/scripts/wasmd/contracts/checksums.sha256
@@ -1,2 +1,2 @@
 aff8c8873d79d2153a8b9066a0683fec3c903669267eb806ffa831dcd4b3daae  cw-erc20.wasm
-8427fcbf9e6c15d0e0dea0afe75640d997a6854d03c3aa1c8bdf1a9787a35681  cw-nameservice.wasm
+d5dde423d321f7d3793a9b1667d06ac86c7f57dfbd2534a9c790963e1c2955ed  cw-nameservice.wasm
diff --git a/scripts/wasmd/contracts/cw-nameservice.wasm b/scripts/wasmd/contracts/cw-nameservice.wasm
index 33f14cc8..d202c747 100644
Binary files a/scripts/wasmd/contracts/cw-nameservice.wasm and b/scripts/wasmd/contracts/cw-nameservice.wasm differ
diff --git a/scripts/wasmd/deploy_nameservice.js b/scripts/wasmd/deploy_nameservice.js
index 023c8b4b..9b689420 100755
--- a/scripts/wasmd/deploy_nameservice.js
+++ b/scripts/wasmd/deploy_nameservice.js
@@ -11,18 +11,27 @@ const faucet = {
   address: "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
 };
 
-const initFree = {
-  name: "Free",
+const codeMeta = {
+  source: "https://crates.io/api/v1/crates/cw-nameservice/0.2.0/download",
+  builder: "confio/cosmwasm-opt:0.7.0",
 };
-const initLuxury = {
-  name: "Luxury",
-  purchase_price: {
-    denom: "ucosm",
-    amount: "2000000",
-  },
-  transfer_price: {
-    denom: "ucosm",
-    amount: "1000000",
+
+const free = {
+  label: "Free",
+  initMsg: {},
+};
+
+const luxury = {
+  label: "Luxury",
+  initMsg: {
+    purchase_price: {
+      denom: "ucosm",
+      amount: "2000000",
+    },
+    transfer_price: {
+      denom: "ucosm",
+      amount: "1000000",
+    },
   },
 };
 
@@ -31,13 +40,13 @@ async function main() {
   const client = new SigningCosmWasmClient(httpUrl, faucet.address, signBytes => pen.sign(signBytes));
 
   const wasm = fs.readFileSync(__dirname + "/contracts/cw-nameservice.wasm");
-  const uploadReceipt = await client.upload(wasm, "Upload Name Service contract");
+  const uploadReceipt = await client.upload(wasm, codeMeta, "Upload Name Service code");
   console.info(`Upload succeeded. Receipt: ${JSON.stringify(uploadReceipt)}`);
 
-  for (const initMsg of [initFree, initLuxury]) {
-    const memo = `Create an nameservice instance for ${initMsg.name}`;
-    const contractAddress = await client.instantiate(uploadReceipt.codeId, initMsg, initMsg.name, memo);
-    console.info(`Contract instantiated for ${initMsg.name} at ${contractAddress}`);
+  for (const { label, initMsg } of [free, luxury]) {
+    const memo = `Create an nameservice instance "${label}"`;
+    const contractAddress = await client.instantiate(uploadReceipt.codeId, initMsg, label, memo);
+    console.info(`Contract "${label}" instantiated at ${contractAddress}`);
   }
 }