diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml
index 1c953a41f..19bcd18e9 100644
--- a/docker-compose_v3_alpine_mysql_latest.yaml
+++ b/docker-compose_v3_alpine_mysql_latest.yaml
@@ -139,16 +139,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -156,8 +154,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml
index 28ed7f1b6..b15b380fa 100644
--- a/docker-compose_v3_alpine_mysql_local.yaml
+++ b/docker-compose_v3_alpine_mysql_local.yaml
@@ -209,16 +209,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -226,8 +224,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml
index 6f9305ffd..3dc781b60 100644
--- a/docker-compose_v3_alpine_pgsql_latest.yaml
+++ b/docker-compose_v3_alpine_pgsql_latest.yaml
@@ -153,16 +153,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -170,8 +168,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml
index 38fbe269a..56440a319 100644
--- a/docker-compose_v3_alpine_pgsql_local.yaml
+++ b/docker-compose_v3_alpine_pgsql_local.yaml
@@ -237,16 +237,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -254,8 +252,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml
index 01731f64d..510d018bb 100644
--- a/docker-compose_v3_centos_mysql_latest.yaml
+++ b/docker-compose_v3_centos_mysql_latest.yaml
@@ -139,16 +139,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -156,8 +154,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml
index 7a68a0136..19c11c72c 100644
--- a/docker-compose_v3_centos_mysql_local.yaml
+++ b/docker-compose_v3_centos_mysql_local.yaml
@@ -210,16 +210,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -227,8 +225,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml
index c71e76c6f..ce881a602 100644
--- a/docker-compose_v3_centos_pgsql_latest.yaml
+++ b/docker-compose_v3_centos_pgsql_latest.yaml
@@ -153,16 +153,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -170,8 +168,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml
index db3d4b21b..b9f32632a 100644
--- a/docker-compose_v3_centos_pgsql_local.yaml
+++ b/docker-compose_v3_centos_pgsql_local.yaml
@@ -237,16 +237,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -254,8 +252,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_ol_mysql_latest.yaml b/docker-compose_v3_ol_mysql_latest.yaml
index 47757f255..71a4dfeca 100644
--- a/docker-compose_v3_ol_mysql_latest.yaml
+++ b/docker-compose_v3_ol_mysql_latest.yaml
@@ -139,16 +139,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -156,8 +154,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml
index 4ca8aa2ec..3fe4e0573 100644
--- a/docker-compose_v3_ol_mysql_local.yaml
+++ b/docker-compose_v3_ol_mysql_local.yaml
@@ -210,16 +210,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -227,8 +225,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_ol_pgsql_latest.yaml b/docker-compose_v3_ol_pgsql_latest.yaml
index f16cd9c67..fdc5dcbb7 100644
--- a/docker-compose_v3_ol_pgsql_latest.yaml
+++ b/docker-compose_v3_ol_pgsql_latest.yaml
@@ -153,16 +153,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -170,8 +168,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml
index f2c80f038..d09555339 100644
--- a/docker-compose_v3_ol_pgsql_local.yaml
+++ b/docker-compose_v3_ol_pgsql_local.yaml
@@ -237,16 +237,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -254,8 +252,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml
index 3f3d51592..808bcc276 100644
--- a/docker-compose_v3_ubuntu_mysql_latest.yaml
+++ b/docker-compose_v3_ubuntu_mysql_latest.yaml
@@ -123,16 +123,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -140,8 +138,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml
index 6a89260b3..76954e8c2 100644
--- a/docker-compose_v3_ubuntu_mysql_local.yaml
+++ b/docker-compose_v3_ubuntu_mysql_local.yaml
@@ -198,16 +198,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -215,8 +213,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml
index e04d4d669..7a676caa3 100644
--- a/docker-compose_v3_ubuntu_pgsql_latest.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml
@@ -137,16 +137,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -154,8 +152,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"
diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml
index 8044c8d4b..99f7807fa 100644
--- a/docker-compose_v3_ubuntu_pgsql_local.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_local.yaml
@@ -225,16 +225,14 @@ services:
 networks:
   frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
+    enable_ipv6: "${FRONTEND_ENABLE_IPV6}"
     ipam:
       driver: "${FRONTEND_NETWORK_DRIVER}"
       config:
       - subnet: "${FRONTEND_SUBNET}"
   backend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}"
+    enable_ipv6: "${BACKEND_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${BACKEND_NETWORK_DRIVER}"
@@ -242,8 +240,7 @@ networks:
       - subnet: "${BACKEND_SUBNET}"
   database:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
+    enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}"
     internal: true
     ipam:
       driver: "${DATABASE_NETWORK_DRIVER}"