diff --git a/geth-poa/docker-compose.yml b/geth-poa/docker-compose.yml
index feb89657e4..db928581b4 100644
--- a/geth-poa/docker-compose.yml
+++ b/geth-poa/docker-compose.yml
@@ -63,6 +63,14 @@ services:
             "openmetrics_endpoint": "http://%%host%%:6060/debug/metrics/prometheus",
             "namespace": "geth-poa",
             "metrics": [
+              "txpool*",
+              "trie*",
+              "system*",
+              "state*",
+              "rpc*",
+              "p2p*",
+              "eth*",
+              "chain*",
               "clique*"
             ]
           }
@@ -93,6 +101,14 @@ services:
             "openmetrics_endpoint": "http://%%host%%:6060/debug/metrics/prometheus",
             "namespace": "geth-poa",
             "metrics": [
+              "txpool*",
+              "trie*",
+              "system*",
+              "state*",
+              "rpc*",
+              "p2p*",
+              "eth*",
+              "chain*",
               "clique*"
             ]
           }
diff --git a/geth-poa/entrypoint.sh b/geth-poa/entrypoint.sh
index 5b38e18be9..ecbaa3e4fd 100644
--- a/geth-poa/entrypoint.sh
+++ b/geth-poa/entrypoint.sh
@@ -64,6 +64,7 @@ if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
 		--ws.api=debug,eth,txpool,net,engine \
 		--syncmode=full \
 		--gcmode=full \
+		--state.scheme=path \
 		--networkid=$CHAIN_ID \
 		--nousb \
 		--metrics \
@@ -82,6 +83,7 @@ elif [ "$GETH_NODE_TYPE" = "signer" ]; then
 		--port 30311 \
 		--syncmode=full \
 		--gcmode=full \
+		--state.scheme=path \
 		--http \
 		--http.corsdomain="*" \
 		--http.vhosts="*" \