diff --git a/Makefile b/Makefile
index 29e3b60..158e758 100644
--- a/Makefile
+++ b/Makefile
@@ -33,12 +33,12 @@ check_os:
 
 # This version must the same as in docker-compose-full.yml
 # TODO add check
-KMS_DEV_VERSION ?= v0.7.1
+KMS_DEV_VERSION ?= v0.8.1-rc2
 
 FHEVM_SOLIDITY_REPO ?= fhevm
 FHEVM_SOLIDITY_PATH ?= $(WORKDIR)/$(FHEVM_SOLIDITY_REPO)
 FHEVM_SOLIDITY_PATH_EXISTS := $(shell test -d $(FHEVM_SOLIDITY_PATH)/.git && echo "true" || echo "false")
-FHEVM_SOLIDITY_VERSION ?= v0.5.2
+FHEVM_SOLIDITY_VERSION ?= v0.5.4-0
 
 export GO111MODULE = on
 
@@ -120,7 +120,6 @@ TEST_FILE := run_tests.sh
 TEST_IF_FROM_REGISTRY := 
 
 run-e2e-test: check-all-test-repo
-	$(MAKE) prepare-e2e-test
 	@cd $(FHEVM_SOLIDITY_PATH) && npx hardhat test
 
 
@@ -137,7 +136,6 @@ prepare-e2e-test: check-all-test-repo
 	@./scripts/fund_test_addresses_docker.sh
 	@cd $(FHEVM_SOLIDITY_PATH) && cp .env.example .env
 	@cd $(FHEVM_SOLIDITY_PATH) && ./setup-local-fhevm.sh
-	@cd $(FHEVM_SOLIDITY_PATH) && npx hardhat test
 
 run-async-test:
 	@cd $(FHEVM_SOLIDITY_PATH) && npx hardhat test --grep 'test async decrypt uint8' 
@@ -148,6 +146,7 @@ run-true-input-async-test:
 e2e-test:
 	@$(MAKE) check-all-test-repo
 	$(MAKE) run-full
+	$(MAKE) prepare-e2e-test
 	$(MAKE) run-e2e-test
 	$(MAKE) stop-full
 
diff --git a/README.md b/README.md
index 020fce8..ea8aedc 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ Execute the following commands:
 make run-full
 # Deploy ACL, Gateway ..., please wait until the end before testing!!!
 make prepare-e2e-test
-# This test will fail (first event catch is buggy - we are on it)
+# This test could fail (first event catch is buggy - we are on it)
 make run-async-test
 # This one is working
 make run-async-test
@@ -78,6 +78,10 @@ cd work_dir/fhevm & npx hardhat test --grep 'test async decrypt several addresse
 ```
 
 
+> :bulb: **Tip:** If one of the test is blocked after a few seconds, check the logs of the gateway with `docker logs zama-dev-gateway-1 -f`. If you do not see any progress after a line like 
+`🍊 Waiting for callback from KMS, txn_id: "85fa7..."`; **stop the test and retry**. We will fix it soon! 
+
+
 
 <details><summary>Docker logs</summary>
 <p>
@@ -175,12 +179,12 @@ docker logs zama-dev-gateway-1 -f
 You should see the following docker images:
 
 ```
-zama-dev-gateway-1	ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.7.1
-zama-dev-connector-1	ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.7.1
-zama-dev-fhevm-validator-1	ghcr.io/zama-ai/ethermint-node:v0.5.0
-zama-dev-kms-core-1	ghcr.io/zama-ai/kms-service-dev:v0.7.1
-zama-dev-kms-validator-1	ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.7.1
-zama-dev-gateway-store-1	ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.7.1
+zama-dev-gateway-1	ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.1-rc2
+zama-dev-connector-1	ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.1-rc2
+zama-dev-fhevm-validator-1	ghcr.io/zama-ai/ethermint-node:v0.5.1
+zama-dev-kms-core-1	ghcr.io/zama-ai/kms-service-dev:v0.8.1-rc2
+zama-dev-kms-validator-1	ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.1-rc2
+zama-dev-gateway-store-1	ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.1-rc2
 ```
 
 ### Stop fhEVM-native + KMS 
diff --git a/docker-compose/docker-compose-full.yml b/docker-compose/docker-compose-full.yml
index ed032ac..74af645 100644
--- a/docker-compose/docker-compose-full.yml
+++ b/docker-compose/docker-compose-full.yml
@@ -3,14 +3,14 @@ name: zama-dev
 services:
 
   gateway-store:
-    image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.7.1
+    image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.1-rc2
     command:
       - "kv_store"
     ports:
       - "8088:8088"
 
   kms-validator:
-    image: ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.7.1
+    image: ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.1-rc2
     ports:
       - "36656:26656"
       - "36657:26657"
@@ -25,7 +25,7 @@ services:
       start_period: 10s
 
   connector:
-    image: ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.7.1
+    image: ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.1-rc2
     command:
       - "kms-blockchain-connector"
     environment:
@@ -43,8 +43,8 @@ services:
         condition: service_healthy
 
   kms-core:
-    image: ghcr.io/zama-ai/kms-service-dev:v0.7.1
-    volumes:  
+    image: ghcr.io/zama-ai/kms-service-dev:v0.8.1-rc2
+    volumes:
       - $PWD/res/keys:/app/kms/core/service/keys:Z
     ports:
       - "50051:50051"
@@ -56,7 +56,7 @@ services:
       start_period: 10s
 
   gateway:
-    image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.7.1
+    image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.1-rc2
     ports:
       - "7077:7077"
     command:
@@ -84,7 +84,7 @@ services:
   fhevm-validator:
     environment:
       - TFHE_EXECUTOR_CONTRACT_ADDRESS=0x05fD9B5EFE0a996095f42Ed7e77c390810CF660c
-    image: ghcr.io/zama-ai/ethermint-dev-node:v0.5.0-2
+    image: ghcr.io/zama-ai/ethermint-dev-node:v0.5.1
     ports:
       - "26656-26657:26656-26657"
       - "8545-8546:8545-8546"