diff --git a/besu.yml b/besu.yml
index c34e5976..218a7251 100644
--- a/besu.yml
+++ b/besu.yml
@@ -59,10 +59,7 @@ services:
       - ${LOG_LEVEL}
       - --network
       - ${EC_NETWORK}
-      - --pruning-enabled
-# This is going to be the new hawtness but should only be used for testing right now.
-# When using this, disable --pruning-enabled.
-#     - --Xdata-storage-format=BONSAI
+      - --Xdata-storage-format=BONSAI
   eth:
     depends_on:
       - execution
diff --git a/teku-validator-notz.yml b/teku-validator-notz.yml
index 6588e28e..fbd792e4 100644
--- a/teku-validator-notz.yml
+++ b/teku-validator-notz.yml
@@ -27,7 +27,7 @@ services:
       - --beacon-node-api-endpoint=${CC_NODE}
       - --data-path=/var/lib/teku
       - --log-destination=CONSOLE
-      - --network=${NETWORK}
+      - --network=auto
       - --validators-keystore-locking-enabled=true
       - --validator-keys=/var/lib/teku/validator-keys:/var/lib/teku/validator-passwords
       - --validators-graffiti=${GRAFFITI}
diff --git a/teku-validator.yml b/teku-validator.yml
index f1eca8ae..265de4ec 100644
--- a/teku-validator.yml
+++ b/teku-validator.yml
@@ -28,7 +28,7 @@ services:
       - --beacon-node-api-endpoint=${CC_NODE}
       - --data-path=/var/lib/teku
       - --log-destination=CONSOLE
-      - --network=${NETWORK}
+      - --network=auto
       - --validators-keystore-locking-enabled=true
       - --validator-keys=/var/lib/teku/validator-keys:/var/lib/teku/validator-passwords
       - --validators-graffiti=${GRAFFITI}