diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml
index ff01077f4..d2c66565a 100644
--- a/docker-compose_v3_alpine_mysql_latest.yaml
+++ b/docker-compose_v3_alpine_mysql_latest.yaml
@@ -155,16 +155,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}"
@@ -172,15 +170,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml
index e7cce1f47..e7307c8a6 100644
--- a/docker-compose_v3_alpine_mysql_local.yaml
+++ b/docker-compose_v3_alpine_mysql_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,15 +240,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml
index 661d4d913..1c99b8689 100644
--- a/docker-compose_v3_alpine_pgsql_latest.yaml
+++ b/docker-compose_v3_alpine_pgsql_latest.yaml
@@ -169,16 +169,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}"
@@ -186,21 +184,18 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
       - subnet: "${ADD_TOOLS_SUBNET}"
 
-
 volumes:
   snmptraps:
 #  mysql_socket:
diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml
index c46cb5fb4..87e652b1c 100644
--- a/docker-compose_v3_alpine_pgsql_local.yaml
+++ b/docker-compose_v3_alpine_pgsql_local.yaml
@@ -253,16 +253,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}"
@@ -270,21 +268,18 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
       - subnet: "${ADD_TOOLS_SUBNET}"
 
-
 volumes:
   snmptraps:
 #  mysql_socket:
diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml
index b53c4c326..41666838d 100644
--- a/docker-compose_v3_centos_mysql_latest.yaml
+++ b/docker-compose_v3_centos_mysql_latest.yaml
@@ -155,16 +155,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}"
@@ -172,15 +170,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml
index b18007fc3..e24647d1c 100644
--- a/docker-compose_v3_centos_mysql_local.yaml
+++ b/docker-compose_v3_centos_mysql_local.yaml
@@ -226,16 +226,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}"
@@ -243,15 +241,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml
index 8e9dc40bf..82cf867bf 100644
--- a/docker-compose_v3_centos_pgsql_latest.yaml
+++ b/docker-compose_v3_centos_pgsql_latest.yaml
@@ -169,16 +169,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}"
@@ -186,15 +184,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml
index 853622d7c..d94d451ef 100644
--- a/docker-compose_v3_centos_pgsql_local.yaml
+++ b/docker-compose_v3_centos_pgsql_local.yaml
@@ -253,16 +253,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}"
@@ -270,15 +268,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_ol_mysql_latest.yaml b/docker-compose_v3_ol_mysql_latest.yaml
index d42dd86bd..51a57ecc1 100644
--- a/docker-compose_v3_ol_mysql_latest.yaml
+++ b/docker-compose_v3_ol_mysql_latest.yaml
@@ -155,16 +155,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}"
@@ -172,15 +170,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml
index 775b838dd..26b438026 100644
--- a/docker-compose_v3_ol_mysql_local.yaml
+++ b/docker-compose_v3_ol_mysql_local.yaml
@@ -226,16 +226,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}"
@@ -243,15 +241,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_ol_pgsql_latest.yaml b/docker-compose_v3_ol_pgsql_latest.yaml
index a88d81f16..a8f17c138 100644
--- a/docker-compose_v3_ol_pgsql_latest.yaml
+++ b/docker-compose_v3_ol_pgsql_latest.yaml
@@ -169,16 +169,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}"
@@ -186,15 +184,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml
index 14783d2b2..a05f907fc 100644
--- a/docker-compose_v3_ol_pgsql_local.yaml
+++ b/docker-compose_v3_ol_pgsql_local.yaml
@@ -253,16 +253,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}"
@@ -270,15 +268,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml
index a9186d363..106277849 100644
--- a/docker-compose_v3_ubuntu_mysql_latest.yaml
+++ b/docker-compose_v3_ubuntu_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,15 +154,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml
index 95b2badbf..e37936c28 100644
--- a/docker-compose_v3_ubuntu_mysql_local.yaml
+++ b/docker-compose_v3_ubuntu_mysql_local.yaml
@@ -214,16 +214,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}"
@@ -231,15 +229,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml
index 44dc8bb87..23cc28230 100644
--- a/docker-compose_v3_ubuntu_pgsql_latest.yaml
+++ b/docker-compose_v3_ubuntu_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,15 +168,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config:
diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml
index d36c8f8db..32f0e19e5 100644
--- a/docker-compose_v3_ubuntu_pgsql_local.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_local.yaml
@@ -241,16 +241,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}"
@@ -258,15 +256,13 @@ 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}"
   tools_frontend:
     driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
+    enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}"
     ipam:
       driver: "${ADD_TOOLS_NETWORK_DRIVER}"
       config: