diff --git a/besu.yml b/besu.yml
index 1055eef2..ea861e4c 100644
--- a/besu.yml
+++ b/besu.yml
@@ -95,3 +95,7 @@ services:
 volumes:
   besu-eth1-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/default.env b/default.env
index bdeaa7db..a54e4f8e 100644
--- a/default.env
+++ b/default.env
@@ -28,7 +28,7 @@ AUTOPRUNE_NM=true
 # Whether to use web3signer for validator keys. Setting this to "true" also requires web3signer.yml in COMPOSE_FILE
 WEB3SIGNER=false
 # Whether to explicitly enable IPv6 P2P. See https://ethdocker.com/Support/ipv6
-# Also add ipv6.yml to COMPOSE_FILE for IPv6.
+# Needs to be "false" or "true" for Eth Docker to work
 IPV6=false
 # Directory to keep ancient data. In use for Geth, optional.
 # If you use this, make sure to chown the directory to uid 10001
@@ -300,4 +300,4 @@ DDNS_TAG=3
 NODE_EXPORTER_IGNORE_MOUNT_REGEX='^/(dev|proc|sys|run|var/lib/docker/.+)($|/)'
 
 # Used by ethd update - please do not adjust
-ENV_VERSION=7
+ENV_VERSION=8
diff --git a/erigon.yml b/erigon.yml
index 4c9f8c8a..03d84a36 100644
--- a/erigon.yml
+++ b/erigon.yml
@@ -105,3 +105,7 @@ services:
 volumes:
   erigon-el-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/ethd b/ethd
index 96af8a97..8b37e1b8 100755
--- a/ethd
+++ b/ethd
@@ -608,7 +608,7 @@ migrate_compose_file() {
     prysm-web.yml blank-grafana.yml lh-grafana.yml lhcc-grafana.yml nimbus-grafana.yml prysm-grafana.yml \
     teku-grafana.yml geth-grafana.yml erigon-grafana.yml oe.yml teku-stats.yml lh-stats.yml lh-stats-consensus.yml \
     lh-stats-validator.yml traefik-shared.yml lh-slasher.yml lighthouse-slasher.yml prysm-slasher.yml \
-    grafana-localhost.yml )
+    grafana-localhost.yml ipv6.yml )
   TO_YML=( el-shared.yml el-traefik.yml cl-shared.yml grafana-shared.yml prysm-web-shared.yml lighthouse.yml \
     lighthouse-vc-only.yml teku-allin1.yml teku-vc-only.yml lighthouse-cl-only.yml lighthouse-vc-only.yml \
     lodestar-cl-only.yml lodestar-vc-only.yml nimbus-cl-only.yml prysm-cl-only.yml prysm-cl-only.yml \
@@ -619,7 +619,7 @@ migrate_compose_file() {
     "" "" "" "" "" "" \
     "" "" "" "" "" "" "" \
     "" "" "" "" "" \
-    "" )
+    "" "" )
 
   __old_grafana=0
   __new_grafana=0
diff --git a/geth.yml b/geth.yml
index 1c597d85..bcf2e7b5 100644
--- a/geth.yml
+++ b/geth.yml
@@ -96,3 +96,7 @@ services:
 volumes:
   geth-eth1-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/ipv6.yml b/ipv6.yml
deleted file mode 100644
index 978aa787..00000000
--- a/ipv6.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Add this to COMPOSE_FILE in .env so docker compose assigns v6 addresses
-# Docker will also need to be configured, please see http://eth-docker.net/Support/ipv6.md
-version: "3.9"
-
-networks:
-  default:
-    enable_ipv6: true
diff --git a/lighthouse-cl-only.yml b/lighthouse-cl-only.yml
index ef278d01..f1771008 100644
--- a/lighthouse-cl-only.yml
+++ b/lighthouse-cl-only.yml
@@ -90,3 +90,7 @@ services:
 volumes:
   lhconsensus-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/lighthouse-vc-only.yml b/lighthouse-vc-only.yml
index d1e5a277..64b82a6c 100644
--- a/lighthouse-vc-only.yml
+++ b/lighthouse-vc-only.yml
@@ -127,3 +127,7 @@ services:
 
 volumes:
   lhvalidator-data:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/lighthouse.yml b/lighthouse.yml
index 68b328d9..ed6a4f04 100644
--- a/lighthouse.yml
+++ b/lighthouse.yml
@@ -213,3 +213,7 @@ volumes:
   lhbeacon-data:
   lhvalidator-data:
   jwtsecret:
+
+  networks:
+    default:
+      enable_ipv6: ${IPV6:-false}
diff --git a/lodestar-cl-only.yml b/lodestar-cl-only.yml
index 1ddba311..2af42d59 100644
--- a/lodestar-cl-only.yml
+++ b/lodestar-cl-only.yml
@@ -89,3 +89,7 @@ services:
 volumes:
   lsconsensus-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/lodestar-vc-only.yml b/lodestar-vc-only.yml
index 28e8cc32..fd235d45 100644
--- a/lodestar-vc-only.yml
+++ b/lodestar-vc-only.yml
@@ -125,3 +125,7 @@ services:
 
 volumes:
   lsvalidator-data:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/lodestar.yml b/lodestar.yml
index b82fd51c..97a9e6c4 100644
--- a/lodestar.yml
+++ b/lodestar.yml
@@ -200,3 +200,7 @@ volumes:
   lsconsensus-data:
   lsvalidator-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/nethermind.yml b/nethermind.yml
index 430b9b56..ef204e1a 100644
--- a/nethermind.yml
+++ b/nethermind.yml
@@ -91,3 +91,7 @@ services:
 volumes:
   nm-eth1-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/nimbus-allin1.yml b/nimbus-allin1.yml
index 7ba412cc..672c570c 100644
--- a/nimbus-allin1.yml
+++ b/nimbus-allin1.yml
@@ -146,3 +146,7 @@ services:
 volumes:
   nimbus-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/nimbus-cl-only.yml b/nimbus-cl-only.yml
index 9aa1ebde..edc1f294 100644
--- a/nimbus-cl-only.yml
+++ b/nimbus-cl-only.yml
@@ -105,3 +105,7 @@ services:
 volumes:
   nimbus-consensus-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/nimbus-el.yml b/nimbus-el.yml
index ae4028f3..1a711583 100644
--- a/nimbus-el.yml
+++ b/nimbus-el.yml
@@ -90,3 +90,7 @@ services:
 volumes:
   nimbus-el-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/nimbus-vc-only.yml b/nimbus-vc-only.yml
index 9700f97e..d2ffc521 100644
--- a/nimbus-vc-only.yml
+++ b/nimbus-vc-only.yml
@@ -100,3 +100,7 @@ services:
 volumes:
   nimbus-vc-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/nimbus.yml b/nimbus.yml
index f271fb4a..685b138e 100644
--- a/nimbus.yml
+++ b/nimbus.yml
@@ -163,3 +163,7 @@ volumes:
   nimbus-consensus-data:
   nimbus-vc-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/prysm-cl-only.yml b/prysm-cl-only.yml
index 9de982a4..8b3206b2 100644
--- a/prysm-cl-only.yml
+++ b/prysm-cl-only.yml
@@ -92,3 +92,7 @@ services:
 volumes:
   prysmconsensus-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/prysm-vc-only.yml b/prysm-vc-only.yml
index 1325fee9..6adb48d5 100644
--- a/prysm-vc-only.yml
+++ b/prysm-vc-only.yml
@@ -167,3 +167,7 @@ services:
 volumes:
   prysmvalidator-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/prysm.yml b/prysm.yml
index 1fa0f98e..b66a7557 100644
--- a/prysm.yml
+++ b/prysm.yml
@@ -245,3 +245,7 @@ volumes:
   prysmbeacon-data:
   prysmvalidator-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/reth.yml b/reth.yml
index d7ba7a01..e3c8ff2a 100644
--- a/reth.yml
+++ b/reth.yml
@@ -89,3 +89,7 @@ services:
 volumes:
   reth-el-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/ssv.yml b/ssv.yml
index 017abb91..8784773a 100644
--- a/ssv.yml
+++ b/ssv.yml
@@ -32,3 +32,7 @@ services:
 
 volumes:
   ssv-data:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/teku-allin1.yml b/teku-allin1.yml
index b2d10e3a..1a5157ae 100644
--- a/teku-allin1.yml
+++ b/teku-allin1.yml
@@ -151,3 +151,7 @@ services:
 volumes:
   teku-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/teku-cl-only.yml b/teku-cl-only.yml
index 30b1a27c..ae8809c2 100644
--- a/teku-cl-only.yml
+++ b/teku-cl-only.yml
@@ -86,3 +86,7 @@ services:
 volumes:
   tekuconsensus-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/teku-vc-only.yml b/teku-vc-only.yml
index f3835159..2681d423 100644
--- a/teku-vc-only.yml
+++ b/teku-vc-only.yml
@@ -112,3 +112,7 @@ services:
 
 volumes:
   teku-data:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}
diff --git a/teku.yml b/teku.yml
index b8b68393..a6e60c2d 100644
--- a/teku.yml
+++ b/teku.yml
@@ -180,3 +180,7 @@ volumes:
   tekuconsensus-data:
   teku-vc-data:
   jwtsecret:
+
+networks:
+  default:
+    enable_ipv6: ${IPV6:-false}