diff --git a/docker-compose.yaml b/docker-compose.yaml
index d4435416..61880f70 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -389,7 +389,7 @@ services:
 
   datool:
     image: nitro-node-dev-testnode
-    entrypoint: /usr/local/bin/datool
+    entrypoint: /usr/local/bin/anytrusttool
     volumes:
       - "config:/config"
       - "das-committee-a-data:/das-committee-a"
@@ -400,7 +400,7 @@ services:
   das-committee-a:
     pid: host # allow debugging
     image: nitro-node-dev-testnode
-    entrypoint: /usr/local/bin/daserver
+    entrypoint: /usr/local/bin/anytrustserver
     ports:
       - "127.0.0.1:9876:9876"
       - "127.0.0.1:9877:9877"
@@ -413,7 +413,7 @@ services:
   das-committee-b:
     pid: host # allow debugging
     image: nitro-node-dev-testnode
-    entrypoint: /usr/local/bin/daserver
+    entrypoint: /usr/local/bin/anytrustserver
     ports:
       - "127.0.0.1:8876:9876"
       - "127.0.0.1:8877:9877"
@@ -426,7 +426,7 @@ services:
   das-mirror:
     pid: host # allow debugging
     image: nitro-node-dev-testnode
-    entrypoint: /usr/local/bin/daserver
+    entrypoint: /usr/local/bin/anytrustserver
     ports:
       - "127.0.0.1:7877:9877"
     volumes:
diff --git a/scripts/config.ts b/scripts/config.ts
index e2c2a036..95540d71 100644
--- a/scripts/config.ts
+++ b/scripts/config.ts
@@ -328,7 +328,9 @@ function writeConfigs(argv: any) {
                     "jwtsecret": valJwtSecret,
                 }
             },
-            "data-availability": createDataAvailabilityConfig(argv, argv.anytrust)
+            "da": {
+                "anytrust": createDataAvailabilityConfig(argv, argv.anytrust)
+            }
         },
         "execution": {
             "sequencer": {
@@ -350,13 +352,12 @@ function writeConfigs(argv: any) {
     }
 
     if (argv.referenceDA) {
-        (baseConfig as any).node["da"] = {
-            "external-provider": {
-                "enable": true,
-                "with-writer": false,
-                "rpc": {
-                    "url": "http://referenceda-provider:9880"
-                }
+        // Assign into node.da rather than replacing it, so the anytrust config set above survives.
+        (baseConfig as any).node["da"]["external-provider"] = {
+            "enable": true,
+            "with-writer": false,
+            "rpc": {
+                "url": "http://referenceda-provider:9880"
             }
         }
     }
@@ -382,7 +383,7 @@ function writeConfigs(argv: any) {
         simpleConfig.node["batch-poster"]["redis-url"] = ""
         simpleConfig.execution["sequencer"].enable = true
         if (argv.anytrust) {
-            simpleConfig.node["data-availability"]["rpc-aggregator"].enable = true
+            simpleConfig.node["da"]["anytrust"]["rpc-aggregator"].enable = true
         }
         if (argv.txfiltering) {
             applyTxFilteringConfig(simpleConfig);
@@ -425,7 +426,7 @@ function writeConfigs(argv: any) {
         posterConfig.node["seq-coordinator"].enable = true
         posterConfig.node["batch-poster"].enable = true
         if (argv.anytrust) {
-            posterConfig.node["data-availability"]["rpc-aggregator"].enable = true
+            posterConfig.node["da"]["anytrust"]["rpc-aggregator"].enable = true
         }
         if (argv.referenceDA) {
             posterConfig.node["da"]["external-provider"]["with-writer"] = true
@@ -439,7 +440,7 @@ function writeConfigs(argv: any) {
     // use the same account for l2 and l3 staker
     // l3Config.node.staker["parent-chain-wallet"].account = namedAddress("l3owner")
     l3Config.node["batch-poster"]["parent-chain-wallet"].account = namedAddress("l3sequencer")
-    l3Config.node["data-availability"] = createDataAvailabilityConfig(argv, false)
+    l3Config.node["da"]["anytrust"] = createDataAvailabilityConfig(argv, false)
     l3Config.chain.id = 333333
     const l3ChainInfoFile = path.join(consts.configpath, "l3_chain_info.json")
     l3Config.chain["info-files"] = [l3ChainInfoFile]
diff --git a/test-node.bash b/test-node.bash
index 9b71da02..72034c2d 100755
--- a/test-node.bash
+++ b/test-node.bash
@@ -2,7 +2,7 @@
 
 set -eu
 
-: ${NITRO_NODE_VERSION:=offchainlabs/nitro-node:v3.9.6-91bf578}
+: ${NITRO_NODE_VERSION:=offchainlabs/nitro-node:v3.11.3-beb2108}
 BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.1.0-0e716c8
 
 # nitro-contract workaround for testnode
@@ -604,7 +604,7 @@ if $l2anytrust; then
         das_bls_b=`docker compose run --rm --entrypoint sh datool -c "cat /das-committee-b/keys/das_bls.pub"`
 
         run_script write-l2-das-keyset-config --dasBlsA $das_bls_a --dasBlsB $das_bls_b
-        docker compose run --rm --entrypoint sh datool -c "/usr/local/bin/datool dumpkeyset --conf.file /config/l2_das_keyset.json | grep 'Keyset: ' | awk '{ printf \"%s\", \$2 }' > /config/l2_das_keyset.hex"
+        docker compose run --rm --entrypoint sh datool -c "/usr/local/bin/anytrusttool dumpkeyset --conf.file /config/l2_das_keyset.json | grep 'Keyset: ' | awk '{ printf \"%s\", \$2 }' > /config/l2_das_keyset.hex"
         run_script set-valid-keyset
 
         anytrustNodeConfigLine="--anytrust --dasBlsA $das_bls_a --dasBlsB $das_bls_b"