diff --git a/cmd/zetae2e/config/local.yml b/cmd/zetae2e/config/local.yml
index ec44f96a65..2481ab31fa 100644
--- a/cmd/zetae2e/config/local.yml
+++ b/cmd/zetae2e/config/local.yml
@@ -85,7 +85,7 @@ rpcs:
   evm: "http://localhost:8545"
   bitcoin:
     host: "localhost:18443"
-    user: "e2etest"
+    user: "smoketest"
     pass: "123"
     http_post_mode: true
     disable_tls: true
diff --git a/cmd/zetae2e/config/localnet.yml b/cmd/zetae2e/config/localnet.yml
index 9cd5e8060a..5bd207a020 100644
--- a/cmd/zetae2e/config/localnet.yml
+++ b/cmd/zetae2e/config/localnet.yml
@@ -85,7 +85,7 @@ rpcs:
   evm: "http://eth:8545"
   bitcoin:
     host: "bitcoin:18443"
-    user: "e2etest"
+    user: "smoketest"
     pass: "123"
     http_post_mode: true
     disable_tls: true
diff --git a/contrib/localnet/docker-compose.yml b/contrib/localnet/docker-compose.yml
index d5625ed6f2..c25c823b8c 100644
--- a/contrib/localnet/docker-compose.yml
+++ b/contrib/localnet/docker-compose.yml
@@ -224,7 +224,7 @@ services:
       -regtest=1
       -rpcallowip=0.0.0.0/0
       -rpcbind=0.0.0.0
-      -rpcauth=e2etest:63acf9b8dccecce914d85ff8c044b78b$$5892f9bbc84f4364e79f0970039f88bdd823f168d4acc76099ab97b14a766a99
+      -rpcauth=smoketest:63acf9b8dccecce914d85ff8c044b78b$$5892f9bbc84f4364e79f0970039f88bdd823f168d4acc76099ab97b14a766a99
       -txindex=1
 
   solana:
diff --git a/e2e/config/config.go b/e2e/config/config.go
index 96b9afcbf8..089ea39b70 100644
--- a/e2e/config/config.go
+++ b/e2e/config/config.go
@@ -160,7 +160,7 @@ func DefaultConfig() Config {
 			EVM:  "http://eth:8545",
 			Bitcoin: BitcoinRPC{
 				Host:         "bitcoin:18443",
-				User:         "e2etest",
+				User:         "smoketest",
 				Pass:         "123",
 				HTTPPostMode: true,
 				DisableTLS:   true,
diff --git a/pkg/chains/chains.go b/pkg/chains/chains.go
index bc2cea1ccf..38c9252291 100644
--- a/pkg/chains/chains.go
+++ b/pkg/chains/chains.go
@@ -171,7 +171,7 @@ var (
 
 	BitcoinSignetTestnet = Chain{
 		ChainName:   ChainName_btc_signet_testnet,
-		ChainId:     18334,
+		ChainId:     18333,
 		Network:     Network_btc,
 		NetworkType: NetworkType_testnet,
 		Vm:          Vm_no_vm,
diff --git a/zetaclient/config/config_chain.go b/zetaclient/config/config_chain.go
index 0b11d2eac3..ca0234c126 100644
--- a/zetaclient/config/config_chain.go
+++ b/zetaclient/config/config_chain.go
@@ -31,7 +31,7 @@ func New(setDefaults bool) Config {
 // bitcoinConfigRegnet contains Bitcoin config for regnet
 func bitcoinConfigRegnet() BTCConfig {
 	return BTCConfig{
-		RPCUsername:     "e2etest",
+		RPCUsername:     "smoketest", // smoketest is the previous name for E2E test, we keep this name for compatibility between client versions in upgrade test
 		RPCPassword:     "123",
 		RPCHost:         "bitcoin:18443",
 		RPCParams:       "regtest",