diff --git a/.github/workflows/ci_e2e_test.yml b/.github/workflows/ci_e2e_test.yml
index 819a5653..bf33a5fa 100644
--- a/.github/workflows/ci_e2e_test.yml
+++ b/.github/workflows/ci_e2e_test.yml
@@ -32,37 +32,28 @@ jobs:
       - name: Get version for all needed repositories
         working-directory: ./evmos
         run: |
-          echo "ZBC_DEVELOPMENT_VERSION=$(./scripts/get_version_from_makefile.sh ZBC_DEVELOPMENT_VERSION)" >> $GITHUB_ENV
           echo "TFHE_RS_VERSION=$(./scripts/get_version_from_makefile.sh TFHE_RS_VERSION)" >> $GITHUB_ENV
-          echo "ZBC_FHE_TOOL_VERSION=$(./scripts/get_version_from_makefile.sh ZBC_FHE_TOOL_VERSION)" >> $GITHUB_ENV
-          echo "ZBC_SOLIDITY_VERSION=$(./scripts/get_version_from_makefile.sh ZBC_SOLIDITY_VERSION)" >> $GITHUB_ENV
+          echo "FHEVM_TFHE_CLI_VERSION=$(./scripts/get_version_from_makefile.sh FHEVM_TFHE_CLI_VERSION)" >> $GITHUB_ENV
+          echo "FHEVM_SOLIDITY_VERSION=$(./scripts/get_version_from_makefile.sh FHEVM_SOLIDITY_VERSION)" >> $GITHUB_ENV
           echo "ETHERMINT_VERSION=$(./scripts/get_module_version.sh go.mod zama.ai/ethermint)" >> $GITHUB_ENV
           echo "GO_ETHEREUM_VERSION=$(./scripts/get_module_version.sh go.mod zama.ai/go-ethereum)" >> $GITHUB_ENV
           
       - name: Echo versions parsed from Makefile and go.mod
         run: |
-          echo "ZBC_DEVELOPMENT_VERSION: $ZBC_DEVELOPMENT_VERSION"
           echo "TFHE_RS_VERSION: $TFHE_RS_VERSION"
-          echo "ZBC_FHE_TOOL_VERSION: $ZBC_FHE_TOOL_VERSION"
-          echo "ZBC_SOLIDITY_VERSION: $ZBC_SOLIDITY_VERSION"
+          echo "FHEVM_TFHE_CLI_VERSION: $FHEVM_TFHE_CLI_VERSION"
+          echo "FHEVM_SOLIDITY_VERSION: $FHEVM_SOLIDITY_VERSION"
           echo "ETHERMINT_VERSION: $ETHERMINT_VERSION"
           echo "GO_ETHEREUM_VERSION: $GO_ETHEREUM_VERSION"
       
-      - name: Checkout zbc-dev
-        uses: actions/checkout@v3
-        with:
-          repository: zama-ai/zbc-development
-          token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
-          path: ./evmos/work_dir/zbc-development
-          ref: ${{ env.ZBC_DEVELOPMENT_VERSION }}
 
-      - name: Checkout zbc-solidity
+      - name: Checkout fhevm-solidity
         uses: actions/checkout@v3
         with:
-          repository: zama-ai/zbc-solidity
+          repository: zama-ai/fhevm-solidity
           token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
-          path: ./evmos/work_dir/zbc-solidity
-          ref: ${{ env.ZBC_SOLIDITY_VERSION }}
+          path: ./evmos/work_dir/fhevm-solidity
+          ref: ${{ env.FHEVM_SOLIDITY_VERSION }}
 
       - name: Checkout tfhe-rs
         uses: actions/checkout@v3
@@ -72,13 +63,13 @@ jobs:
           path: ./evmos/work_dir/tfhe-rs
           ref: ${{ env.TFHE_RS_VERSION }}
 
-      - name: Checkout zbc-fhe-tool
+      - name: Checkout fhevm-tfhe-cli
         uses: actions/checkout@v3
         with:
-          repository: zama-ai/zbc-fhe-tool
+          repository: zama-ai/fhevm-tfhe-cli
           token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
-          path: ./evmos/work_dir/zbc-fhe-tool
-          ref: ${{ env.ZBC_FHE_TOOL_VERSION }}
+          path: ./evmos/work_dir/fhevm-tfhe-cli
+          ref: ${{ env.FHEVM_TFHE_CLI_VERSION }}
 
       - name: Checkout go-ethereum
         uses: actions/checkout@v3
@@ -106,11 +97,11 @@ jobs:
           ls 
 
       - name: Prepare files for node setup
-        working-directory: evmos/work_dir/zbc-development
+        working-directory: evmos
         run: |
           mkdir -p node/evmos
-          cp ../../private.ed25519 node/evmos 
-          cp ../../public.ed25519 node/evmos 
+          cp private.ed25519 node/evmos 
+          cp public.ed25519 node/evmos 
           touch vm.log
           ls node/evmos
 
@@ -132,7 +123,7 @@ jobs:
           docker images
 
       - name: Install @openzeppelin/contracts
-        working-directory: evmos/work_dir/zbc-solidity
+        working-directory: evmos/work_dir/fhevm-solidity
         run: |
           npm install @openzeppelin/contracts
 
@@ -141,6 +132,5 @@ jobs:
         run: |
           ls ${{ github.workspace }}
           ls work_dir
-          ls work_dir/zbc-fhe-tool
-          ls work_dir/zbc-fhe-tool/.git
+          ls work_dir/fhevm-tfhe-cli
           make e2e-test
diff --git a/.github/workflows/deploy_validator_aws.yml b/.github/workflows/deploy_validator_aws.yml
index 38bc5def..00259923 100644
--- a/.github/workflows/deploy_validator_aws.yml
+++ b/.github/workflows/deploy_validator_aws.yml
@@ -68,19 +68,19 @@ jobs:
       - name: Get version for all needed repositories
         working-directory: ./evmos
         run: |
-          echo "ZBC_SOLIDITY_VERSION=$(./scripts/get_version_from_makefile.sh ZBC_SOLIDITY_VERSION)" >> $GITHUB_ENV
+          echo "FHEVM_TFHE_CLI_VERSION=$(./scripts/get_version_from_makefile.sh FHEVM_TFHE_CLI_VERSION)" >> $GITHUB_ENV
           
       - name: Echo versions parsed from Makefile and go.mod
         run: |
-          echo "ZBC_SOLIDITY_VERSION: $ZBC_SOLIDITY_VERSION"
+          echo "FHEVM_TFHE_CLI_VERSION: $FHEVM_TFHE_CLI_VERSION"
 
-      - name: Checkout zbc-solidity
+      - name: Checkout fhevm-tfhe-cli
         uses: actions/checkout@v3
         with:
-          repository: zama-ai/zbc-solidity
+          repository: zama-ai/fhevm-tfhe-cli
           token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
-          path: ./evmos/work_dir/zbc-solidity
-          ref: ${{ env.ZBC_SOLIDITY_VERSION }}
+          path: ./evmos/work_dir/fhevm-tfhe-cli
+          ref: ${{ env.FHEVM_TFHE_CLI_VERSION }}
 
       - name: List files in the repository
         run: |
@@ -152,8 +152,8 @@ jobs:
         run: |
           sleep 10s
           
-      - name: List files in zbc-solidity
-        working-directory: evmos/work_dir/zbc-solidity
+      - name: List files in fhevm-tfhe-cli
+        working-directory: evmos/work_dir/fhevm-tfhe-cli
         run: |
           ls
 
@@ -166,17 +166,17 @@ jobs:
           ./scripts/upload_genesis.sh
 
       - name: Prepare/download fhe keys
-        working-directory: evmos/work_dir/zbc-solidity
+        working-directory: evmos/work_dir/fhevm-tfhe-cli
         run: |
           ./ci/scripts/prepare_fhe_keys_ci.sh
 
       - name: Install @openzeppelin/contracts
-        working-directory: evmos/work_dir/zbc-solidity
+        working-directory: evmos/work_dir/fhevm-tfhe-cli
         run: |
           npm install @openzeppelin/contracts
 
       - name: Run e2e test from zbc-solidty
         if: ${{ inputs.run_test }}
-        working-directory: evmos/work_dir/zbc-solidity
+        working-directory: evmos/work_dir/fhevm-tfhe-cli
         run: |
           ./ci/scripts/run_ERC20_ci_test.sh mykey1 ../../
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 38360a2f..6cc1bb80 100755
--- a/Makefile
+++ b/Makefile
@@ -38,17 +38,17 @@ TFHE_RS_EXISTS := $(shell test -d $(TFHE_RS_PATH)/.git && echo "true" || echo "f
 TFHE_RS_VERSION ?= 0.3.0-beta.0 
 
 
-ZBC_FHE_TOOL_PATH ?= $(WORKDIR)/zbc-fhe-tool
-ZBC_FHE_TOOL_PATH_EXISTS := $(shell test -d $(ZBC_FHE_TOOL_PATH)/.git && echo "true" || echo "false")
-ZBC_FHE_TOOL_VERSION ?= v0.1.1
+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.1.1-renaming
 
-ZBC_ORACLE_DB_PATH ?= $(WORKDIR)/zbc-oracle-db
-ZBC_ORACLE_DB_PATH_EXISTS := $(shell test -d $(ZBC_ORACLE_DB_PATH)/.git && echo "true" || echo "false")
-ZBC_ORACLE_DB_VERSION ?= main
+FHEVM_REQUIRES_DB_PATH ?= $(WORKDIR)/fhevm-requires-db
+FHEVM_REQUIRES_DB_PATH_EXISTS := $(shell test -d $(FHEVM_REQUIRES_DB_PATH)/.git && echo "true" || echo "false")
+FHEVM_REQUIRES_DB_VERSION ?= v0.1.0
 
-ZBC_SOLIDITY_PATH ?= $(WORKDIR)/zbc-solidity
-ZBC_SOLIDITY_PATH_EXISTS := $(shell test -d $(ZBC_SOLIDITY_PATH)/.git && echo "true" || echo "false")
-ZBC_SOLIDITY_VERSION ?= v0.1.3-beta
+FHEVM_SOLIDITY_PATH ?= $(WORKDIR)/fhevm-solidity
+FHEVM_SOLIDITY_PATH_EXISTS := $(shell test -d $(FHEVM_SOLIDITY_PATH)/.git && echo "true" || echo "false")
+FHEVM_SOLIDITY_VERSION ?= v0.1.5
 
 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)
@@ -151,13 +151,13 @@ print-info:
 	@echo 'GO_ETHEREUM_TAG: $(GO_ETHEREUM_VERSION) ---extracted from go.mod'
 	@echo 'ETHERMINT_TAG: $(ETHERMINT_VERSION) ---extracted from go.mod'
 	@echo 'TFHE_RS_VERSION: $(TFHE_RS_VERSION) ---extracted from Makefile'
-	@echo 'ZBC_FHE_TOOL_VERSION: $(ZBC_FHE_TOOL_VERSION) ---extracted from Makefile'
-	@echo 'ZBC_ORACLE_DB_VERSION: $(ZBC_ORACLE_DB_VERSION) ---extracted from Makefile'
-	@echo 'ZBC_SOLIDITY_VERSION: $(ZBC_SOLIDITY_VERSION) ---extracted from Makefile'
+	@echo 'FHEVM_TFHE_CLI_VERSION: $(FHEVM_TFHE_CLI_VERSION) ---extracted from Makefile'
+	@echo 'FHEVM_REQUIRES_DB_VERSION: $(FHEVM_REQUIRES_DB_VERSION) ---extracted from Makefile'
+	@echo 'FHEVM_SOLIDITY_VERSION: $(FHEVM_SOLIDITY_VERSION) ---extracted from Makefile'
 	@bash scripts/get_repository_info.sh evmos ${CURDIR}
 	@bash scripts/get_repository_info.sh tfhe-rs $(TFHE_RS_PATH)
-	@bash scripts/get_repository_info.sh zbc-fhe-tool $(ZBC_FHE_TOOL_PATH)
-	@bash scripts/get_repository_info.sh zbc-solidity $(ZBC_SOLIDITY_PATH)
+	@bash scripts/get_repository_info.sh fhevm-tfhe-cli $(FHEVM_TFHE_CLI_PATH)
+	@bash scripts/get_repository_info.sh fhevm-solidity $(FHEVM_SOLIDITY_PATH)
 
 
 
@@ -210,93 +210,93 @@ else
 	$(MAKE) clone_tfhe_rs
 endif
 
-check-zbc-solidity: $(WORKDIR)/
-	$(info check-zbc-solidity)
-ifeq ($(ZBC_SOLIDITY_PATH_EXISTS), true)
-	@echo "zbc-solidity exists in $(ZBC_SOLIDITY_PATH)"
-	@if [ ! -d $(WORKDIR)/zbc-solidity ]; then \
-        echo 'zbc-solidity is not available in $(WORKDIR)'; \
-        echo "ZBC_SOLIDITY_PATH is set to a custom value"; \
+check-fhevm-solidity: $(WORKDIR)/
+	$(info check-fhevm-solidity)
+ifeq ($(FHEVM_SOLIDITY_PATH_EXISTS), true)
+	@echo "fhevm-solidity exists in $(FHEVM_SOLIDITY_PATH)"
+	@if [ ! -d $(WORKDIR)/fhevm-solidity ]; then \
+        echo 'fhevm-solidity is not available in $(WORKDIR)'; \
+        echo "FHEVM_SOLIDITY_PATH is set to a custom value"; \
     else \
-        echo 'zbc-solidity is already available in $(WORKDIR)'; \
+        echo 'fhevm-solidity is already available in $(WORKDIR)'; \
     fi
 else
-	@echo "zbc-solidity does not exist"
+	@echo "fhevm-solidity does not exist"
 	echo "We clone it for you!"
-	echo "If you want your own version please update ZBC_SOLIDITY_PATH pointing to your zbc-solidity folder!"
-	$(MAKE) clone_zbc_solidty
+	echo "If you want your own version please update FHEVM_SOLIDITY_PATH pointing to your fhevm-solidity folder!"
+	$(MAKE) clone_fhevm_solidity
 endif
 
-check-zbc-oracle-db: $(WORKDIR)/
-	$(info check-zbc-oracle-db)
-ifeq ($(ZBC_ORACLE_DB_PATH_EXISTS), true)
-	@echo "zbc-oracle-db exists in $(ZBC_ORACLE_DB_PATH)"
-	@if [ ! -d $(WORKDIR)/zbc-oracle-db ]; then \
-        echo 'zbc-oracle-db is not available in $(WORKDIR)'; \
-        echo "ZBC_ORACLE_DB_PATH is set to a custom value"; \
+check-fhevm-requires-db: $(WORKDIR)/
+	$(info check-fhevm-requires-db)
+ifeq ($(FHEVM_REQUIRES_DB_PATH_EXISTS), true)
+	@echo "fhevm-requires-db exists in $(FHEVM_REQUIRES_DB_PATH)"
+	@if [ ! -d $(WORKDIR)/fhevm-requires-db ]; then \
+        echo 'fhevm-requires-db is not available in $(WORKDIR)'; \
+        echo "FHEVM_REQUIRES_DB_PATH is set to a custom value"; \
     else \
-        echo 'zbc-oracle-db is already available in $(WORKDIR)'; \
+        echo 'fhevm-requires-db is already available in $(WORKDIR)'; \
     fi
 else
-	@echo "zbc-oracle-db does not exist"
+	@echo "fhevm-requires-db does not exist"
 	echo "We clone it for you!"
-	echo "If you want your own version please update ZBC_ORACLE_DB_PATH pointing to your zbc-oracle-db folder!"
-	$(MAKE) clone_zbc_oracle_db
+	echo "If you want your own version please update FHEVM_REQUIRES_DB_PATH pointing to your fhevm-requires-db folder!"
+	$(MAKE) clone_fhevm_requires_db
 endif
 
 
-check-zbc-fhe-tool: $(WORKDIR)/
-	$(info check-zbc-fhe-tool)
-	@echo "ZBC_FHE_TOOL_PATH_EXISTS  $(ZBC_FHE_TOOL_PATH_EXISTS)"
-ifeq ($(ZBC_FHE_TOOL_PATH_EXISTS), true)
-	@echo "zbc-fhe-tool exists in $(ZBC_FHE_TOOL_PATH)"
-	@if [ ! -d $(WORKDIR)/zbc-fhe-tool ]; then \
-        echo 'zbc-fhe-tool is not available in $(WORKDIR)'; \
-        echo "ZBC_FHE_TOOL_PATH is set to a custom value"; \
+check-fhevm-tfhe-cli: $(WORKDIR)/
+	$(info check-fhevm-tfhe-cli)
+	@echo "FHEVM_TFHE_CLI_PATH_EXISTS  $(FHEVM_TFHE_CLI_PATH_EXISTS)"
+ifeq ($(FHEVM_TFHE_CLI_PATH_EXISTS), true)
+	@echo "fhevm-tfhe-cli exists in $(FHEVM_TFHE_CLI_PATH)"
+	@if [ ! -d $(WORKDIR)/fhevm-tfhe-cli ]; then \
+        echo 'fhevm-tfhe-cli is not available in $(WORKDIR)'; \
+        echo "FHEVM_TFHE_CLI_PATH is set to a custom value"; \
     else \
-        echo 'zbc-fhe-tool is already available in $(WORKDIR)'; \
+        echo 'fhevm-tfhe-cli is already available in $(WORKDIR)'; \
     fi
 else
-	@echo "zbc-fhe-tool does not exist in $(ZBC_FHE_TOOL_PATH)"
+	@echo "fhevm-tfhe-cli does not exist in $(FHEVM_TFHE_CLI_PATH)"
 	echo "We clone it for you!"
-	echo "If you want your own version please update ZBC_FHE_TOOL_PATH pointing to your zbc-fhe-tool folder!"
-	$(MAKE) clone_zbc_fhe_tool
+	echo "If you want your own version please update FHEVM_TFHE_CLI_PATH pointing to your fhevm-tfhe-cli folder!"
+	$(MAKE) clone_fhevm_tfhe_cli
 endif
 	echo 'Call build zbc fhe'
-	$(MAKE) build_zbc_fhe_tool
+	$(MAKE) build_fhevm_tfhe_cli
 
 
 
 install-tfhe-rs: clone_tfhe_rs
 
-build_zbc_fhe_tool:
+build_fhevm_tfhe_cli:
 ifeq ($(HOST_ARCH), x86_64)
 	@echo 'Arch is x86'
-	@ARCH_TO_BUIL_ZBC_FHE_TOOL=$$(cd $(ZBC_FHE_TOOL_PATH) && ./scripts/get_arch.sh) && cd $(ZBC_FHE_TOOL_PATH) && cargo build --release --features tfhe/$${ARCH_TO_BUIL_ZBC_FHE_TOOL}
+	@ARCH_TO_BUIL_FHEVM_TFHE_CLI=$$(cd $(FHEVM_TFHE_CLI_PATH) && ./scripts/get_arch.sh) && cd $(FHEVM_TFHE_CLI_PATH) && cargo build --release --features tfhe/$${ARCH_TO_BUIL_FHEVM_TFHE_CLI}
 else
 	@echo 'Arch is not x86'
-	@ARCH_TO_BUIL_ZBC_FHE_TOOL=$$(cd $(ZBC_FHE_TOOL_PATH) && ./scripts/get_arch.sh) && cd $(ZBC_FHE_TOOL_PATH) && cargo +nightly build --release --features tfhe/$${ARCH_TO_BUIL_ZBC_FHE_TOOL}
+	@ARCH_TO_BUIL_FHEVM_TFHE_CLI=$$(cd $(FHEVM_TFHE_CLI_PATH) && ./scripts/get_arch.sh) && cd $(FHEVM_TFHE_CLI_PATH) && cargo +nightly build --release --features tfhe/$${ARCH_TO_BUIL_FHEVM_TFHE_CLI}
 endif	
 
-clone_zbc_fhe_tool: $(WORKDIR)/
-	$(info Cloning zbc-fhe-tool version $(ZBC_FHE_TOOL_VERSION))
-	cd $(WORKDIR) && git clone git@github.com:zama-ai/zbc-fhe-tool.git
-	cd $(WORKDIR)/zbc-fhe-tool && git checkout $(ZBC_FHE_TOOL_VERSION)
+clone_fhevm_tfhe_cli: $(WORKDIR)/
+	$(info Cloning fhevm-tfhe-cli version $(FHEVM_TFHE_CLI_VERSION))
+	cd $(WORKDIR) && git clone git@github.com:zama-ai/fhevm-tfhe-cli.git
+	cd $(WORKDIR)/fhevm-tfhe-cli && git checkout $(FHEVM_TFHE_CLI_VERSION)
 	
-clone_zbc_solidty: $(WORKDIR)/
-	$(info Cloning zbc-solidity version $(ZBC_SOLIDITY_VERSION))
-	cd $(WORKDIR) && git clone git@github.com:zama-ai/zbc-solidity.git
-	cd $(WORKDIR)/zbc-solidity && git checkout $(ZBC_SOLIDITY_VERSION)
+clone_fhevm_solidity: $(WORKDIR)/
+	$(info Cloning fhevm-solidity version $(FHEVM_SOLIDITY_VERSION))
+	cd $(WORKDIR) && git clone git@github.com:zama-ai/fhevm-solidity.git
+	cd $(WORKDIR)/fhevm-solidity && git checkout $(FHEVM_SOLIDITY_VERSION)
 
 clone_tfhe_rs: $(WORKDIR)/
 	$(info Cloning tfhe-rs version $(TFHE_RS_VERSION))
 	cd $(WORKDIR) && git clone git@github.com:zama-ai/tfhe-rs.git
 	cd $(WORKDIR)/tfhe-rs && git checkout $(TFHE_RS_VERSION)
 
-clone_zbc_oracle_db: $(WORKDIR)/
-	$(info Cloning zbc-oracle-db version $(ZBC_ORACLE_DB_VERSION))
-	cd $(WORKDIR) && git clone git@github.com:zama-ai/zbc-oracle-db.git
-	cd $(WORKDIR)/zbc-oracle-db && git checkout $(ZBC_ORACLE_DB_VERSION)
+clone_fhevm_requires_db: $(WORKDIR)/
+	$(info Cloning fhevm-requires-db version $(FHEVM_REQUIRES_DB_VERSION))
+	cd $(WORKDIR) && git clone git@github.com:zama-ai/fhevm-requires-db.git
+	cd $(WORKDIR)/fhevm-requires-db && git checkout $(FHEVM_REQUIRES_DB_VERSION)
 
 clone_go_ethereum: $(WORKDIR)/
 	$(info Cloning Go-ethereum version $(GO_ETHEREUM_VERSION))
@@ -321,7 +321,7 @@ $(WORKDIR)/:
 	$(info WORKDIR)
 	mkdir -p $(WORKDIR)
 
-check-all-test-repo: check-zbc-fhe-tool check-zbc-solidity
+check-all-test-repo: check-fhevm-tfhe-cli check-fhevm-solidity
 
 update-go-mod:
 	@cp go.mod $(UPDATE_GO_MOD)
@@ -370,7 +370,7 @@ build-from-registry:
 generate_fhe_keys:
 	@echo 'generate_fhe_keys'
 	# Generate fhe global keys and copy into volumes
-	@bash ./scripts/prepare_volumes_from_fhe_tool.sh $(ZBC_FHE_TOOL_PATH)/target/release
+	@bash ./scripts/prepare_volumes_from_fhe_tool.sh $(FHEVM_TFHE_CLI_PATH)/target/release
 
 
 run_evmos:
@@ -394,14 +394,14 @@ else
 endif
 
 run_e2e_test:
-	@cd $(ZBC_SOLIDITY_PATH) && ci/scripts/prepare_fhe_keys_for_e2e_test.sh $(CURDIR)/volumes/network-public-fhe-keys
-	@cd $(ZBC_SOLIDITY_PATH) && npm install
+	@cd $(FHEVM_SOLIDITY_PATH) && ci/scripts/prepare_fhe_keys_for_e2e_test.sh $(CURDIR)/volumes/network-public-fhe-keys
+	@cd $(FHEVM_SOLIDITY_PATH) && npm install
 ifeq ($(LOCAL_BUILD),true)
 	$(info LOCAL_BUILD is set)
-	@cd $(ZBC_SOLIDITY_PATH) && ci/scripts/run_ERC20_e2e_test.sh mykey1 $(CURDIR)
+	@cd $(FHEVM_SOLIDITY_PATH) && ci/scripts/run_ERC20_e2e_test.sh mykey1 $(CURDIR)
 else
 	$(info LOCAL_BUILD is not set)
-	@cd $(ZBC_SOLIDITY_PATH) && ci/scripts/run_ERC20_ci_test.sh mykey1 $(CURDIR)
+	@cd $(FHEVM_SOLIDITY_PATH) && ci/scripts/run_ERC20_ci_test.sh mykey1 $(CURDIR)
 endif
 	@sleep 5
 	
diff --git a/docker-compose/docker-compose.validator.override.yml b/docker-compose/docker-compose.validator.override.yml
index 9770b31e..669a4684 100644
--- a/docker-compose/docker-compose.validator.override.yml
+++ b/docker-compose/docker-compose.validator.override.yml
@@ -2,4 +2,4 @@ version: '3'
 
 services:
   validator:
-    entrypoint: /usr/bin/evmosd  start --home /root/.evmosd    --minimum-gas-prices=0.000000000000000001aevmos  --json-rpc.gas-cap=9999999999999999  --gas-prices=0.00000000000000000000000000000000001aev0mos  --gas-adjustment=0.000000000000000000000000001 --json-rpc.api eth,txpool,personal,net,debug,web3
+    entrypoint: /usr/bin/evmosd  start --home /root/.evmosd --pruning=nothing --log_level info  --minimum-gas-prices=0.0001aevmos  --json-rpc.gas-cap=50000000  --json-rpc.api eth,txpool,net,web3  --log_format json
diff --git a/docker-compose/docker-compose.validator.yml b/docker-compose/docker-compose.validator.yml
index ddd9f06c..9d2e867e 100644
--- a/docker-compose/docker-compose.validator.yml
+++ b/docker-compose/docker-compose.validator.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   validator:
-    image: ghcr.io/zama-ai/evmos-node:v0.1.5
+    image: ghcr.io/zama-ai/evmos-node:v0.1.6
     container_name: evmosnode0
     ports:
       - "26656-26657:26656-26657"
diff --git a/go.mod b/go.mod
index 6cfc91ac..9857ff6a 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.6
+replace github.com/ethereum/go-ethereum v1.10.19 => github.com/zama-ai/go-ethereum v0.1.7
 
-replace github.com/evmos/ethermint v0.19.3 => github.com/zama-ai/ethermint v0.1.0
+replace github.com/evmos/ethermint v0.19.3 => github.com/zama-ai/ethermint v0.1.2
diff --git a/scripts/prepare_volumes_from_fhe_tool.sh b/scripts/prepare_volumes_from_fhe_tool.sh
index 641730ca..4def966e 100755
--- a/scripts/prepare_volumes_from_fhe_tool.sh
+++ b/scripts/prepare_volumes_from_fhe_tool.sh
@@ -1,24 +1,24 @@
 #!/bin/bash
 
-# This bash script creates key for 4 different users: global, alice, bob and carol
+# This bash script creates global fhe keys
 # and copy them to the right folder in volumes directory.
-# It accepts the path to the zbc-fhe tool as parameter.
+# It accepts the path to the fhevm-tfhe-cli as parameter.
 
 set -Eeuo pipefail
 
 if [ "$#" -ne 1 ]; then
-    echo "Please give the path to the zbc-fhe tool"
-    echo "Example: $(basename $0) PATH_TO/zbc-fhe-tool/target/release"
-    echo "Reminder to build zbc-fhe-tool: cargo build --release "
+    echo "Please give the path to the fhevm-tfhe-cli"
+    echo "Example: $(basename $0) PATH_TO/fhevm-tfhe-cli/target/release"
+    echo "Reminder to build fhevm-tfhe-cli: cargo build --release "
     exit
 fi
 
-ZBC_FHE_TOOL_PATH=$1
-BINARY_NAME="zbc-fhe-tool"
+FHEVM_TFHE_CLI_PATH=$1
+BINARY_NAME="fhevm-tfhe-cli"
 CURRENT_FOLDER=$PWD
 
-echo "Check if $BINARY_NAME is available in $ZBC_FHE_TOOL_PATH "
-if [ ! -f "$ZBC_FHE_TOOL_PATH/$BINARY_NAME" ]; then
+echo "Check if $BINARY_NAME is available in $FHEVM_TFHE_CLI_PATH "
+if [ ! -f "$FHEVM_TFHE_CLI_PATH/$BINARY_NAME" ]; then
     echo "#####ATTENTION######"
     echo "BINARY_NAME does not exist!"
     echo "####################"
@@ -31,7 +31,7 @@ fi
 KEYS_FULL_PATH=$CURRENT_FOLDER/res/keys
 mkdir -p $KEYS_FULL_PATH
 
-$ZBC_FHE_TOOL_PATH/$BINARY_NAME generate-keys -d res/keys
+$FHEVM_TFHE_CLI_PATH/$BINARY_NAME generate-keys -d res/keys
 
 
 echo "###########################################################"