diff --git a/registry.json b/registry.json
index 71b186efe08..87180cf17b8 100644
--- a/registry.json
+++ b/registry.json
@@ -3186,7 +3186,7 @@
     "publicKeyType": "secp256k1",
     "hrp": "thor",
     "addressHasher": "sha256ripemd",
-    "chainId": "thorchain-mainnet-v1",
+    "chainId": "thorchain-1",
     "explorer": {
       "url": "https://viewblock.io/thorchain",
       "txPath": "/tx/",
@@ -3197,7 +3197,7 @@
     "info": {
       "url": "https://thorchain.org",
       "source": "https://gitlab.com/thorchain/thornode",
-      "rpc": "https://seed.thorchain.info",
+      "rpc": "https://thornode.ninerealms.com",
       "documentation": "https://docs.thorchain.org"
     }
   },
diff --git a/tests/chains/Cosmos/THORChain/TWSwapTests.cpp b/tests/chains/Cosmos/THORChain/TWSwapTests.cpp
index df999de49ad..9492770c08f 100644
--- a/tests/chains/Cosmos/THORChain/TWSwapTests.cpp
+++ b/tests/chains/Cosmos/THORChain/TWSwapTests.cpp
@@ -307,7 +307,7 @@ TEST(TWTHORChainSwap, SwapRuneDoge) {
     // invoke swap
     const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
     const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
-    EXPECT_EQ(outputData.size(), 153ul);
+    EXPECT_EQ(outputData.size(), 144ul);
     // parse result in proto
     Proto::SwapOutput outputProto;
     EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
@@ -322,6 +322,8 @@ TEST(TWTHORChainSwap, SwapRuneDoge) {
     auto& fee = *txInput.mutable_fee();
     fee.set_gas(50000000);
 
+    // Override the chainId as it has been after a hardfork recently.
+    txInput.set_chain_id("thorchain-mainnet-v1");
     txInput.set_account_number(75247);
     txInput.set_sequence(8);
 
@@ -367,7 +369,7 @@ TEST(TWTHORChainSwap, SwapRuneBnbStreamParams) {
     // invoke swap
     const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
     const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
-    EXPECT_EQ(outputData.size(), 156ul);
+    EXPECT_EQ(outputData.size(), 147ul);
     // parse result in proto
     Proto::SwapOutput outputProto;
     EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
@@ -382,6 +384,7 @@ TEST(TWTHORChainSwap, SwapRuneBnbStreamParams) {
     auto& fee = *txInput.mutable_fee();
     fee.set_gas(50000000);
 
+    txInput.set_chain_id("thorchain-mainnet-v1");
     txInput.set_account_number(76456);
     txInput.set_sequence(0);