diff --git a/Dockerfile b/Dockerfile
index bdd57f022..5721a5afa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,6 +63,6 @@ USER relayer
 
 WORKDIR /home/relayer
 
-COPY ./env/godWallet.json ./keys/godwallet.json
+COPY ./env/ibc-icon/godWallet.json ./keys/godwallet.json
 
 CMD ["/bin/rly"]
diff --git a/env/godWallet.json b/env/ibc-icon/godWallet.json
similarity index 100%
rename from env/godWallet.json
rename to env/ibc-icon/godWallet.json
diff --git a/env/password b/env/password
deleted file mode 100644
index 2fc16e853..000000000
--- a/env/password
+++ /dev/null
@@ -1 +0,0 @@
-gochain
\ No newline at end of file
diff --git a/relayer/chains/icon/client_test.go b/relayer/chains/icon/client_test.go
index 2c0d0b448..fe925683a 100644
--- a/relayer/chains/icon/client_test.go
+++ b/relayer/chains/icon/client_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
-	"path/filepath"
 	"testing"
 	"time"
 
@@ -26,11 +25,10 @@ func NewTestClient() *Client {
 
 func GetLisbonIconProvider(network_id int, contractAddress string) *IconProvider {
 
-	absPath, _ := filepath.Abs("../../../env/godWallet.json")
-
 	pcfg := IconProviderConfig{
-		Keystore:          absPath,
-		ChainID:           "icon",
+		Keystore:          "godWallet",
+		KeyDirectory:      "../../../env",
+		ChainID:           "ibc-icon",
 		Password:          "gochain",
 		ICONNetworkID:     2,
 		BTPNetworkID:      int64(network_id),
@@ -49,7 +47,7 @@ func GetLisbonIconProvider(network_id int, contractAddress string) *IconProvider
 
 func getTestWallet() (module.Wallet, error) {
 
-	keyStore_file := "../../../env/godWallet.json"
+	keyStore_file := "../../../env/ibc-icon/godWallet.json"
 	kpass := "gochain"
 
 	keystore_bytes, err := ioutil.ReadFile(keyStore_file)
diff --git a/relayer/chains/icon/keys_test.go b/relayer/chains/icon/keys_test.go
index 108f14242..369787c19 100644
--- a/relayer/chains/icon/keys_test.go
+++ b/relayer/chains/icon/keys_test.go
@@ -16,6 +16,10 @@ func TestCreateKeystore(t *testing.T) {
 	kwName := "testWallet.json"
 	p := &IconProvider{
 		client: NewClient(ENDPOINT, &zap.Logger{}),
+		PCfg: &IconProviderConfig{
+			KeyDirectory: "../../../env",
+			ChainID:      "ibc-icon",
+		},
 	}
 	err := p.CreateKeystore(kwName)
 	require.NoError(t, err)
diff --git a/relayer/chains/wasm/provider_test.go b/relayer/chains/wasm/provider_test.go
index 04022438c..58bd1f74a 100644
--- a/relayer/chains/wasm/provider_test.go
+++ b/relayer/chains/wasm/provider_test.go
@@ -78,7 +78,8 @@ func TestGetAddress(t *testing.T) {
 	assert.NoError(t, err)
 	pArch := p.(*WasmProvider)
 	assert.NoError(t, err)
-	a := "archway1jpdcgkwv7wmwaqc6lyvd82dwhkxxfvplp6u8gw"
+	// prefix will be setup when querying a contract or doing a txn, not when provider is initialized
+	a := "cosmos1jpdcgkwv7wmwaqc6lyvd82dwhkxxfvpl53qrze"
 	addr, err := pArch.GetKeyAddress()
 	assert.NoError(t, err)
 	assert.Equal(t, a, addr.String())
@@ -381,10 +382,10 @@ func TestSerializeAny(t *testing.T) {
 
 func GetIconProvider(network_id int) *icon.IconProvider {
 
-	absPath, _ := filepath.Abs("../../../env/godWallet.json")
-
 	pcfg := icon.IconProviderConfig{
-		Keystore:          absPath,
+		Keystore:          "godWallet",
+		KeyDirectory:      "../../../env",
+		ChainID:           "ibc-icon",
 		Password:          "gochain",
 		ICONNetworkID:     3,
 		BTPNetworkID:      int64(network_id),