diff --git a/Makefile b/Makefile
index ca8fcb33..e13bb28f 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ EMULATOR_ARGS := --flow-network-id=flow-emulator \
 		--wallet-api-key=2619878f0e2ff438d17835c2a4561cb87b4d24d72d12ec34569acd0dd4af7c21 \
 		--gas-price=0 \
 		--log-writer=console \
+		--tx-state-validation=local-index \
 		--profiler-enabled=true \
 		--profiler-port=6060
 
@@ -138,7 +139,7 @@ docker-run-local:
 	$(call check_and_append,coa-address,EMULATOR_COA_ADDRESS)
 	$(call check_and_append,coa-key,EMULATOR_COA_KEY)
 
-	$(eval CMD_ARGS += --flow-network-id=flow-emulator --log-level=debug --gas-price=0 --log-writer=console --profiler-enabled=true --access-node-grpc-host=host.docker.internal:3569)
+	$(eval CMD_ARGS += --flow-network-id=flow-emulator --tx-state-validation=local-index --log-level=debug --gas-price=0 --log-writer=console --profiler-enabled=true --access-node-grpc-host=host.docker.internal:3569)
 
 	docker run -p 8545:8545 --add-host=host.docker.internal:host-gateway "$(CONTAINER_REGISTRY)/flow-evm-gateway:$(COMMIT)" $(CMD_ARGS)
 
@@ -209,7 +210,7 @@ endif
 	$(call check_and_append,coa-key,COA_KEY)
 	$(call check_and_append,gas-price,GAS_PRICE)
 
-	$(eval CMD_ARGS += --ws-enabled=true --rate-limit=9999999 --rpc-host=0.0.0.0 --log-level=info)
+	$(eval CMD_ARGS += --ws-enabled=true --rate-limit=9999999 --rpc-host=0.0.0.0 --log-level=info --tx-state-validation=local-index)
 	$(call check_and_append,access-node-spork-hosts,ACCESS_NODE_SPORK_HOSTS)
 
 	docker run $(MODE) -p $(HOST_PORT):8545 -p 8080:8080 $(MOUNT) "$(CONTAINER_REGISTRY)/flow-evm-gateway:$(IMAGE_TAG)" $(CMD_ARGS)
diff --git a/deploy/systemd-docker/flow-evm-gateway.service b/deploy/systemd-docker/flow-evm-gateway.service
index 37eefd0e..87c560c9 100644
--- a/deploy/systemd-docker/flow-evm-gateway.service
+++ b/deploy/systemd-docker/flow-evm-gateway.service
@@ -32,6 +32,7 @@ ExecStart=docker run --rm \
     --coa-key=${COA_KEY} \
     --access-node-spork-hosts=${ACCESS_NODE_SPORK_HOSTS} \
     --ws-enabled=true \
+    --tx-state-validation=local-index \
     --rate-limit=9999999 \
     --rpc-host=0.0.0.0 \
     --log-level=error
\ No newline at end of file
diff --git a/deploy/systemd-docker/runtime-conf.env b/deploy/systemd-docker/runtime-conf.env
index 3012d219..0cd6ab0d 100644
--- a/deploy/systemd-docker/runtime-conf.env
+++ b/deploy/systemd-docker/runtime-conf.env
@@ -6,4 +6,4 @@ FLOW_NETWORK_ID=FLOW_NETWORK_ID
 INIT_CADENCE_HEIGHT=INITIAL_CADENCE_HEIGHT
 COINBASE=EVM_COINBASE_ADDRESS
 COA_ADDRESS=CADENCE_COA_ADDRESS
-COA_KEY=COA_PRIVATE_KEY
\ No newline at end of file
+COA_KEY=CADENCE_COA_KEY
\ No newline at end of file