diff --git a/Makefile b/Makefile
index 4ffe24cf..60bb8e07 100755
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ FHEVM_REQUIRES_DB_VERSION ?= v0.1.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 ?= v0.1.7
+FHEVM_SOLIDITY_VERSION ?= 8bf0e4cf5d127d9e269a99f700790c966bef9da3
 
 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)
diff --git a/docker-compose/docker-compose.local.yml b/docker-compose/docker-compose.local.yml
index 72c18748..d2996ac0 100644
--- a/docker-compose/docker-compose.local.yml
+++ b/docker-compose/docker-compose.local.yml
@@ -24,7 +24,7 @@ services:
         ipv4_address: 192.167.10.2
 
   oracledb:
-    image: ghcr.io/zama-ai/oracle-db-service:latest
+    image: ghcr.io/zama-ai/fhevm-decryptions-db:v0.1.5
     container_name: zbcoracledb
     ports:
       - "8001:8001"
diff --git a/go.mod b/go.mod
index 9857ff6a..ebfa055c 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.7
+replace github.com/ethereum/go-ethereum v1.10.19 => github.com/zama-ai/go-ethereum v0.1.8-gamma
 
 replace github.com/evmos/ethermint v0.19.3 => github.com/zama-ai/ethermint v0.1.2