diff --git a/bridge/pkg/devnet/constants.go b/bridge/pkg/devnet/constants.go
index 65ff66c9..c1a5f4cd 100644
--- a/bridge/pkg/devnet/constants.go
+++ b/bridge/pkg/devnet/constants.go
@@ -22,7 +22,7 @@ var (
 	GanacheClientDefaultAccountAddress = common.HexToAddress("0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1")
 
 	// Contracts (deployed by "truffle migrate" on a deterministic devnet)
-	GanacheBridgeContractAddress = common.HexToAddress("0x254dffcd3277c0b1660f6d42efbb754edababc2b")
+	GanacheBridgeContractAddress = common.HexToAddress("0xC89Ce4735882C9F0f0FE26686c53074E09B0D550")
 
 	// ERC20 example tokens.
 	GanacheExampleERC20Token        = common.HexToAddress("0xCfEB869F69431e42cdB54A4F4f105C19C080A601")
diff --git a/bridge_ui/src/utils/consts.ts b/bridge_ui/src/utils/consts.ts
index 2d2cfd6a..219eb6ec 100644
--- a/bridge_ui/src/utils/consts.ts
+++ b/bridge_ui/src/utils/consts.ts
@@ -37,13 +37,13 @@ export const CHAINS_BY_ID: ChainsById = CHAINS.reduce((obj, chain) => {
 export const WORMHOLE_RPC_HOST = "http://localhost:8080";
 export const SOLANA_HOST = "http://localhost:8899";
 export const ETH_TEST_TOKEN_ADDRESS = getAddress(
-  "0x0290FB167208Af455bB137780163b7B7a9a10C16"
+  "0x67B5656d60a809915323Bf2C40A8bEF15A152e3e"
 );
 export const ETH_BRIDGE_ADDRESS = getAddress(
-  "0x254dffcd3277c0b1660f6d42efbb754edababc2b"
+  "0xC89Ce4735882C9F0f0FE26686c53074E09B0D550"
 );
 export const ETH_TOKEN_BRIDGE_ADDRESS = getAddress(
-  "0xe982e462b094850f12af94d21d470e21be9d0e9c"
+  "0x0290FB167208Af455bB137780163b7B7a9a10C16"
 );
 export const SOL_TEST_TOKEN_ADDRESS =
   "2WDq7wSs9zYrpx2kbHDA4RUTRch2CCTP6ZWaH4GNfnQQ";
diff --git a/clients/token_bridge/main.ts b/clients/token_bridge/main.ts
index dfbd2797..0ef80285 100644
--- a/clients/token_bridge/main.ts
+++ b/clients/token_bridge/main.ts
@@ -193,7 +193,7 @@ yargs(hideBin(process.argv))
                 alias: 't',
                 type: 'string',
                 description: 'Token Bridge address',
-                default: "0xe982e462b094850f12af94d21d470e21be9d0e9c"
+                default: "0x0290FB167208Af455bB137780163b7B7a9a10C16"
             })
             .option('key', {
                 alias: 'k',
diff --git a/solana/devnet_setup.sh b/solana/devnet_setup.sh
index 2a1fdf2b..bc161805 100755
--- a/solana/devnet_setup.sh
+++ b/solana/devnet_setup.sh
@@ -52,7 +52,7 @@ retry token-bridge-client create-bridge "$token_bridge_address" "$bridge_address
 
 # Register the Solana Endpoint on ETH
 pushd /usr/src/clients/token_bridge
-node main.js solana execute_governance_vaa 01000000000100a1f5ebf9d460dbbbaf0b72df36b37139baac61bb3128eec2d77f2e53a57c15592f4c97521f8eb3a7279299219be0342877960a8bfa7da9782313bb0ff5855aba01000000010000000100010000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000546f6b656e4272696467650100000002000000000000000000000000e982e462b094850f12af94d21d470e21be9d0e9c
+node main.js solana execute_governance_vaa $(node main.js generate_register_chain_vaa 2 0x0000000000000000000000000290FB167208Af455bB137780163b7B7a9a10C16)
 popd
 
 # Let k8s startup probe succeed