diff --git a/typescript/helloworld b/typescript/helloworld
index 389243614..264839c0b 160000
--- a/typescript/helloworld
+++ b/typescript/helloworld
@@ -1 +1 @@
-Subproject commit 389243614f72307702d807c709dce4c4a35f7118
+Subproject commit 264839c0bfa3d4a4c3d4a2714e356fd7275a347b
diff --git a/typescript/infra/config/environments/mainnet2/helloworld/hyperlane/addresses.json b/typescript/infra/config/environments/mainnet2/helloworld/hyperlane/addresses.json
index 1392bbc30..8263b5535 100644
--- a/typescript/infra/config/environments/mainnet2/helloworld/hyperlane/addresses.json
+++ b/typescript/infra/config/environments/mainnet2/helloworld/hyperlane/addresses.json
@@ -24,6 +24,6 @@
     "router": "0xbaa8e84def81f92ECB4161e45BA5Eda16B255397"
   },
   "gnosis": {
-    "router": "0xBC9cd961BF6c224FAc51fb049aB6788e38e4A9C0"
+    "router": "0x182E8d7c5F1B06201b102123FC7dF0EaeB445a7B"
   }
 }
diff --git a/typescript/infra/config/environments/mainnet2/helloworld/hyperlane/verification.json b/typescript/infra/config/environments/mainnet2/helloworld/hyperlane/verification.json
index f55a9e405..6979a4ee3 100644
--- a/typescript/infra/config/environments/mainnet2/helloworld/hyperlane/verification.json
+++ b/typescript/infra/config/environments/mainnet2/helloworld/hyperlane/verification.json
@@ -69,6 +69,12 @@
       "address": "0xBC9cd961BF6c224FAc51fb049aB6788e38e4A9C0",
       "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
       "isProxy": false
+    },
+    {
+      "name": "router",
+      "address": "0x182E8d7c5F1B06201b102123FC7dF0EaeB445a7B",
+      "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
+      "isProxy": false
     }
   ]
 }
diff --git a/typescript/infra/config/environments/mainnet2/helloworld/rc/addresses.json b/typescript/infra/config/environments/mainnet2/helloworld/rc/addresses.json
index d7e6de8d9..ace3e7c1e 100644
--- a/typescript/infra/config/environments/mainnet2/helloworld/rc/addresses.json
+++ b/typescript/infra/config/environments/mainnet2/helloworld/rc/addresses.json
@@ -1,29 +1,29 @@
 {
+  "gnosis": {
+    "router": "0x99ca8c74cE7Cfa9d72A51fbb05F9821f5f826b3a"
+  },
   "bsc": {
-    "router": "0x3f4663873A9aC7Ec683a5Bddc0acbC00091c10D0"
+    "router": "0xe5554478F167936dB253f79f57c41770bfa00Bae"
   },
   "avalanche": {
-    "router": "0xaC5a4925d8aab7B9fb33F0a1722e3b94b6f87dB4"
+    "router": "0xe1De9910fe71cC216490AC7FCF019e13a34481D7"
   },
   "polygon": {
-    "router": "0x3Ee06Da5110117c5B9AD41e2F827B774cBb15CC3"
+    "router": "0xAb65C41a1BC580a52f0b166879122EFdce0cB868"
   },
   "celo": {
-    "router": "0x8E10405F4D23060b1a75005EFB99d99D537e0A7f"
+    "router": "0xfE29f6a4468536029Fc9c97d3a9669b9fe38E114"
   },
   "arbitrum": {
-    "router": "0xb44a2B834FFdf762051Ee26Eb41531a4A02fA8d0"
+    "router": "0x414B67F62b143d6db6E9b633168Dd6fd4DA20642"
   },
   "optimism": {
-    "router": "0xe5F7E241F9bb6A644e88f2ca38fC373196b5392b"
+    "router": "0xB4caf2CA864B413DAA502fA18A8D48cD0740fC52"
   },
   "ethereum": {
-    "router": "0x43ae568363c4FA6897EE9dF0c9ca445d3872c906"
+    "router": "0xed31c20c5517EaC05decD5F6dCd01Fe6d16fD09D"
   },
   "moonbeam": {
-    "router": "0x1Efd1EdC42ef6cf2612F75e6C599C081d650c513"
-  },
-  "gnosis": {
-    "router": "0x14aBb1f28B06272c57c37723D0e671d1c3326679"
+    "router": "0x3eB9eE2CFC8DCB6F58B5869D33336CFcBf1dC354"
   }
 }
diff --git a/typescript/infra/config/environments/mainnet2/helloworld/rc/verification.json b/typescript/infra/config/environments/mainnet2/helloworld/rc/verification.json
index 343c3762b..bd533c714 100644
--- a/typescript/infra/config/environments/mainnet2/helloworld/rc/verification.json
+++ b/typescript/infra/config/environments/mainnet2/helloworld/rc/verification.json
@@ -5,6 +5,12 @@
       "address": "0x3f4663873A9aC7Ec683a5Bddc0acbC00091c10D0",
       "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
       "isProxy": false
+    },
+    {
+      "name": "router",
+      "address": "0xe5554478F167936dB253f79f57c41770bfa00Bae",
+      "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
+      "isProxy": false
     }
   ],
   "avalanche": [
@@ -13,6 +19,12 @@
       "address": "0xaC5a4925d8aab7B9fb33F0a1722e3b94b6f87dB4",
       "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
       "isProxy": false
+    },
+    {
+      "name": "router",
+      "address": "0xe1De9910fe71cC216490AC7FCF019e13a34481D7",
+      "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
+      "isProxy": false
     }
   ],
   "polygon": [
@@ -21,6 +33,12 @@
       "address": "0x3Ee06Da5110117c5B9AD41e2F827B774cBb15CC3",
       "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
       "isProxy": false
+    },
+    {
+      "name": "router",
+      "address": "0xAb65C41a1BC580a52f0b166879122EFdce0cB868",
+      "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
+      "isProxy": false
     }
   ],
   "celo": [
@@ -29,6 +47,12 @@
       "address": "0x8E10405F4D23060b1a75005EFB99d99D537e0A7f",
       "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
       "isProxy": false
+    },
+    {
+      "name": "router",
+      "address": "0xfE29f6a4468536029Fc9c97d3a9669b9fe38E114",
+      "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
+      "isProxy": false
     }
   ],
   "arbitrum": [
@@ -37,6 +61,12 @@
       "address": "0xb44a2B834FFdf762051Ee26Eb41531a4A02fA8d0",
       "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
       "isProxy": false
+    },
+    {
+      "name": "router",
+      "address": "0x414B67F62b143d6db6E9b633168Dd6fd4DA20642",
+      "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
+      "isProxy": false
     }
   ],
   "optimism": [
@@ -45,6 +75,12 @@
       "address": "0xe5F7E241F9bb6A644e88f2ca38fC373196b5392b",
       "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
       "isProxy": false
+    },
+    {
+      "name": "router",
+      "address": "0xB4caf2CA864B413DAA502fA18A8D48cD0740fC52",
+      "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
+      "isProxy": false
     }
   ],
   "ethereum": [
@@ -53,6 +89,12 @@
       "address": "0x43ae568363c4FA6897EE9dF0c9ca445d3872c906",
       "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
       "isProxy": false
+    },
+    {
+      "name": "router",
+      "address": "0xed31c20c5517EaC05decD5F6dCd01Fe6d16fD09D",
+      "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
+      "isProxy": false
     }
   ],
   "moonbeam": [
@@ -61,6 +103,12 @@
       "address": "0x1Efd1EdC42ef6cf2612F75e6C599C081d650c513",
       "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
       "isProxy": false
+    },
+    {
+      "name": "router",
+      "address": "0x3eB9eE2CFC8DCB6F58B5869D33336CFcBf1dC354",
+      "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
+      "isProxy": false
     }
   ],
   "gnosis": [
@@ -69,6 +117,12 @@
       "address": "0x14aBb1f28B06272c57c37723D0e671d1c3326679",
       "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
       "isProxy": false
+    },
+    {
+      "name": "router",
+      "address": "0x99ca8c74cE7Cfa9d72A51fbb05F9821f5f826b3a",
+      "constructorArguments": "00000000000000000000000035231d4c2d8b8adcb5617a638a0c4548684c7c7000000000000000000000000056f52c0a1ddcd557285f7cbc782d3d83096ce1cc",
+      "isProxy": false
     }
   ]
 }
diff --git a/typescript/infra/config/environments/testnet3/helloworld/rc/addresses.json b/typescript/infra/config/environments/testnet3/helloworld/rc/addresses.json
index edd14046b..3d5a0a0b8 100644
--- a/typescript/infra/config/environments/testnet3/helloworld/rc/addresses.json
+++ b/typescript/infra/config/environments/testnet3/helloworld/rc/addresses.json
@@ -1,26 +1,26 @@
 {
   "alfajores": {
-    "router": "0x908200F276B36dAa2FAfe0757bB7188F36E85d3E"
+    "router": "0x40Adcb03F3C58170b4751c4140636FC6085Ff475"
   },
   "fuji": {
-    "router": "0xc91Fcf115926705737394c4560E8b974f28eaad6"
+    "router": "0xAc003FcDD0EE223664F2A000B5A59D082745700b"
   },
   "mumbai": {
-    "router": "0x5B30cF4a552B32FBF9c15b98f91e863D822f355C"
+    "router": "0xaB0892029C3E7dD4c0235590dc296E618A7b4d03"
   },
   "bsctestnet": {
-    "router": "0x07453BE646Aab789a4AcE31DB68688263fB48D53"
+    "router": "0xd259b0e793535325786675542aB296c451535c27"
   },
   "goerli": {
-    "router": "0x04E9e0B2EC0bB80F9A914d82435DeE7f10ce7D29"
+    "router": "0x03e9531ae74e8F0f96DE26788a22d35bdaD24185"
   },
   "moonbasealpha": {
-    "router": "0xa5075B2AcA697944273d67B57a3340a0730632A3"
+    "router": "0xE9D6317a10860340f035f3d09052D9d376855bE8"
   },
   "optimismgoerli": {
-    "router": "0x793A8E343eBc1498afd644A05507fc2b6B97AfB4"
+    "router": "0x057d38d184d74192B96840D8FbB37e584dDb569A"
   },
   "arbitrumgoerli": {
-    "router": "0xa1E338311C26a00Eb586133728c3C9B97c67fAe0"
+    "router": "0xaAF1BF6f2BfaE290ea8615066fd167e396a2f578"
   }
 }
diff --git a/typescript/infra/config/environments/testnet3/helloworld/rc/verification.json b/typescript/infra/config/environments/testnet3/helloworld/rc/verification.json
index 85e7dd895..63c54aefa 100644
--- a/typescript/infra/config/environments/testnet3/helloworld/rc/verification.json
+++ b/typescript/infra/config/environments/testnet3/helloworld/rc/verification.json
@@ -2,7 +2,7 @@
   "alfajores": [
     {
       "name": "router",
-      "address": "0x908200F276B36dAa2FAfe0757bB7188F36E85d3E",
+      "address": "0x40Adcb03F3C58170b4751c4140636FC6085Ff475",
       "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac1",
       "isProxy": false
     }
@@ -10,7 +10,7 @@
   "fuji": [
     {
       "name": "router",
-      "address": "0xc91Fcf115926705737394c4560E8b974f28eaad6",
+      "address": "0xAc003FcDD0EE223664F2A000B5A59D082745700b",
       "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac1",
       "isProxy": false
     }
@@ -18,7 +18,7 @@
   "mumbai": [
     {
       "name": "router",
-      "address": "0x5B30cF4a552B32FBF9c15b98f91e863D822f355C",
+      "address": "0xaB0892029C3E7dD4c0235590dc296E618A7b4d03",
       "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac1",
       "isProxy": false
     }
@@ -26,7 +26,7 @@
   "bsctestnet": [
     {
       "name": "router",
-      "address": "0x07453BE646Aab789a4AcE31DB68688263fB48D53",
+      "address": "0xd259b0e793535325786675542aB296c451535c27",
       "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac1",
       "isProxy": false
     }
@@ -34,7 +34,7 @@
   "goerli": [
     {
       "name": "router",
-      "address": "0x04E9e0B2EC0bB80F9A914d82435DeE7f10ce7D29",
+      "address": "0x03e9531ae74e8F0f96DE26788a22d35bdaD24185",
       "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac1",
       "isProxy": false
     }
@@ -42,7 +42,7 @@
   "moonbasealpha": [
     {
       "name": "router",
-      "address": "0xa5075B2AcA697944273d67B57a3340a0730632A3",
+      "address": "0xE9D6317a10860340f035f3d09052D9d376855bE8",
       "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac1",
       "isProxy": false
     }
@@ -50,7 +50,7 @@
   "optimismgoerli": [
     {
       "name": "router",
-      "address": "0x793A8E343eBc1498afd644A05507fc2b6B97AfB4",
+      "address": "0x057d38d184d74192B96840D8FbB37e584dDb569A",
       "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac1",
       "isProxy": false
     }
@@ -58,7 +58,7 @@
   "arbitrumgoerli": [
     {
       "name": "router",
-      "address": "0xa1E338311C26a00Eb586133728c3C9B97c67fAe0",
+      "address": "0xaAF1BF6f2BfaE290ea8615066fd167e396a2f578",
       "constructorArguments": "000000000000000000000000cc737a94fecaec165abcf12ded095bb13f037685000000000000000000000000f90cb82a76492614d07b82a7658917f3ac811ac1",
       "isProxy": false
     }