diff --git a/Makefile b/Makefile
index 5edc8d19..77050383 100755
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ TFHE_RS_VERSION ?= 0.3.1
 USE_DOCKER_FOR_FHE_KEYS ?= true
 FHEVM_TFHE_CLI_PATH ?= $(WORKDIR)/fhevm-tfhe-cli
 FHEVM_TFHE_CLI_PATH_EXISTS := $(shell test -d $(FHEVM_TFHE_CLI_PATH)/.git && echo "true" || echo "false")
-FHEVM_TFHE_CLI_VERSION ?= v0.2.0
+FHEVM_TFHE_CLI_VERSION ?= v0.2.1
 
 FHEVM_DECRYPTIONS_DB_PATH ?= $(WORKDIR)/fhevm-decryptions-db
 FHEVM_DECRYPTIONS_DB_PATH_EXISTS := $(shell test -d $(FHEVM_DECRYPTIONS_DB_PATH)/.git && echo "true" || echo "false")
@@ -49,7 +49,7 @@ FHEVM_DECRYPTIONS_DB_VERSION ?= v0.2.0
 
 FHEVM_SOLIDITY_PATH ?= $(WORKDIR)/fhevm-solidity
 FHEVM_SOLIDITY_PATH_EXISTS := $(shell test -d $(FHEVM_SOLIDITY_PATH)/.git && echo "true" || echo "false")
-FHEVM_SOLIDITY_VERSION ?= 35ec2d71d3994d8ebacfe9facfc28e49a016e6fd
+FHEVM_SOLIDITY_VERSION ?= v0.1.12
 ETHERMINT_VERSION := $(shell ./scripts/get_module_version.sh go.mod zama.ai/ethermint)
 GO_ETHEREUM_VERSION := $(shell ./scripts/get_module_version.sh go.mod zama.ai/go-ethereum)
 UPDATE_GO_MOD = go.mod.updated
diff --git a/go.mod b/go.mod
index 1817da62..59c76e72 100644
--- a/go.mod
+++ b/go.mod
@@ -173,6 +173,6 @@ replace (
 replace github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
 
 // TODO: Remove once our forks are public.
-replace github.com/ethereum/go-ethereum v1.10.19 => github.com/zama-ai/go-ethereum v0.1.11
+replace github.com/ethereum/go-ethereum v1.10.19 => ../go-ethereum
 
-replace github.com/evmos/ethermint v0.19.3 => github.com/zama-ai/ethermint v0.1.2
+replace github.com/evmos/ethermint v0.19.3 => ../ethermint
diff --git a/go.sum b/go.sum
index ace83802..0a6a2eb6 100644
--- a/go.sum
+++ b/go.sum
@@ -862,10 +862,6 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/zama-ai/ethermint v1.0.0-test h1:x00Rxncw8qhzvV75S9lPbcmYBumGZ8ZZ8lGWgDawjHY=
-github.com/zama-ai/ethermint v1.0.0-test/go.mod h1:JEqkvu6ZC6GV0nq7txpzmaRQdfDzwFay1SRumKsEkg8=
-github.com/zama-ai/go-ethereum v1.0.1-test h1:WpTU7WP2W9fyZZYD+n0t26S1Njk6lzb3szKVgvVZ/SE=
-github.com/zama-ai/go-ethereum v1.0.1-test/go.mod h1:IJBNMtzKcNHPtllYihy6BL2IgK1u+32JriaTbdt4v+w=
 github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8=
 github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
diff --git a/setup.sh b/setup.sh
index 2523fd06..2a2c071d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -4,7 +4,7 @@ KEY1="mykey1"
 KEY2="mykey2"
 CHAINID="evmos_9000-1"
 MONIKER="localtestnet"
-KEYRING="test" # remember to change to other types of keyring like 'file' in-case exposing to outside world, otherwise your balance will be wiped quickly. The keyring test does not require private key to steal tokens from you
+KEYRING="file" # remember to change to other types of keyring like 'file' in-case exposing to outside world, otherwise your balance will be wiped quickly. The keyring test does not require private key to steal tokens from you
 KEYALGO="eth_secp256k1"
 LOGLEVEL="info"
 # to trace evm
@@ -27,7 +27,8 @@ $EVMOSD config keyring-backend $KEYRING
 $EVMOSD config chain-id $CHAINID
 
 # if keys exist, they should be deleted
-$EVMOSD keys add $KEY1 --keyring-backend $KEYRING --algo $KEYALGO
+echo "inch antique visual biology post economy country lucky case stool recycle stumble connect wine cupboard boat health clerk patch pen nice sweet upgrade gift" | $EVMOSD keys add $KEY1 --recover
+# $EVMOSD keys add $KEY1 --keyring-backend $KEYRING --algo $KEYALGO
 
 # Set moniker and chain-id for Evmos (Moniker can be anything, chain-id must be an integer)
 $EVMOSD init $MONIKER --chain-id $CHAINID
@@ -134,10 +135,10 @@ cp ./private.ed25519 $HOME_EVMOSD/zama/keys/signature-keys
 cp ./public.ed25519 $HOME_EVMOSD/zama/keys/signature-keys
 
 echo "Your private keys:"
-$EVMOSD keys unsafe-export-eth-key mykey1 --keyring-backend test
-$EVMOSD keys unsafe-export-eth-key mykey2 --keyring-backend test
+$EVMOSD keys unsafe-export-eth-key mykey1 --keyring-backend os
+# $EVMOSD keys unsafe-export-eth-key mykey2 --keyring-backend os
 
 touch $HOME/privkey
-$EVMOSD keys unsafe-export-eth-key mykey1 --keyring-backend test > $HOME/privkey
+$EVMOSD keys unsafe-export-eth-key mykey1 --keyring-backend os > $HOME/privkey
 touch $HOME/node_id
 $EVMOSD tendermint show-node-id > $HOME/node_id