diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/Dockerfile b/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/Dockerfile
index 3afb524..cecbe3d 100644
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/Dockerfile
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/Dockerfile
@@ -16,6 +16,8 @@ COPY --from=geth /usr/local/bin/geth /usr/local/bin/
 COPY --from=fnetgen /opt/genesis /opt/testnet
 
 # Initialize the geth db with our config
-RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey
+RUN geth --datadir ~/ethdata --state.scheme hash \
+    init /opt/testnet/build/el/geth.json && \
+    rm -f ~/ethdata/geth/nodekey
 
 ENTRYPOINT ["/opt/testnet/run.sh"]
diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/run-el.sh b/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/run-el.sh
index 86224b0..f074131 100755
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/run-el.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/run-el.sh
@@ -75,6 +75,7 @@ else
       --http.corsdomain="*" \
       --networkid="${NETWORK_ID}" \
       --netrestrict="${NETRESTRICT}" \
+      --state.scheme hash \
       --gcmode archive \
       --txlookuplimit=0 \
       --cache.preimages \