diff --git a/applications/venv-manager/containerlab/containerlab.go b/applications/venv-manager/containerlab/containerlab.go
index 42635a6cfecf3640a253b9dffce7d355df19386d..573df9ea929c2ca8e8364705cbb27b3be40ece85 100644
--- a/applications/venv-manager/containerlab/containerlab.go
+++ b/applications/venv-manager/containerlab/containerlab.go
@@ -3,8 +3,8 @@ package containerlab
 // Management represents the management part for containerlab.
 type Management struct {
 	Network    string `yaml:"network,omitempty"`
-	Ipv4Subnet string `yaml:"ipv4_subnet,omitempty"`
-	Ipv6Subnet string `yaml:"ipv6_subnet,omitempty"`
+	Ipv4Subnet string `yaml:"ipv4-subnet,omitempty"`
+	Ipv6Subnet string `yaml:"ipv6-subnet,omitempty"`
 }
 
 // Link represents a link for containerlab.
diff --git a/cli/test/containerlab/integrationtest.clab.tmpl.yml b/cli/test/containerlab/integrationtest.clab.tmpl.yml
index edc8cb65906eba80a93b725a45621ab8c57c9a72..e94143c5e616f4eb29e3fee5a38825d16e069601 100644
--- a/cli/test/containerlab/integrationtest.clab.tmpl.yml
+++ b/cli/test/containerlab/integrationtest.clab.tmpl.yml
@@ -3,7 +3,7 @@ name: @@CLAB_NAME@@
 
 mgmt:
   network: @@CLAB_NAME@@
-  ipv4_subnet: @@CLAB_MGMT_SUBNET@@
+  ipv4-subnet: @@CLAB_MGMT_SUBNET@@
 
 topology:
   kinds:
diff --git a/cli/test/containerlab/integrationtest_branch.clab.tmpl.yml b/cli/test/containerlab/integrationtest_branch.clab.tmpl.yml
index 140b6bb0f37cc416359c51acf4ee9c29233b388e..40c1e3e21d9b9001e2774e28109c5c126b2de106 100644
--- a/cli/test/containerlab/integrationtest_branch.clab.tmpl.yml
+++ b/cli/test/containerlab/integrationtest_branch.clab.tmpl.yml
@@ -3,7 +3,7 @@ name: @@CLAB_NAME@@
 
 mgmt:
   network: @@CLAB_NAME@@
-  ipv4_subnet: @@CLAB_MGMT_SUBNET@@
+  ipv4-subnet: @@CLAB_MGMT_SUBNET@@
 
 topology:
   kinds:
diff --git a/controller/test/containerlab/complex-1.0.clab.tmpl.yml b/controller/test/containerlab/complex-1.0.clab.tmpl.yml
index cdec98b888e1aff0bd56b69cd863f10aa928ef21..470f399a8aaa2c4af9e4615066d565429378a6b0 100644
--- a/controller/test/containerlab/complex-1.0.clab.tmpl.yml
+++ b/controller/test/containerlab/complex-1.0.clab.tmpl.yml
@@ -3,7 +3,7 @@ name: @@CLAB_NAME@@
 
 mgmt:
   network: @@CLAB_NAME@@
-  ipv4_subnet: @@CLAB_MGMT_SUBNET@@
+  ipv4-subnet: @@CLAB_MGMT_SUBNET@@
 
 topology:
   nodes:
diff --git a/controller/test/containerlab/dev.clab.tmpl.yml b/controller/test/containerlab/dev.clab.tmpl.yml
index 985bd75394a310f93eac3dc276bcd10274126700..97602dd09561d6ddf4050e3380a6e156241666fe 100644
--- a/controller/test/containerlab/dev.clab.tmpl.yml
+++ b/controller/test/containerlab/dev.clab.tmpl.yml
@@ -3,7 +3,7 @@ name: @@CLAB_NAME@@
 
 mgmt:
   network: clab-@@CLAB_NAME@@
-  ipv4_subnet: @@CLAB_MGMT_SUBNET@@
+  ipv4-subnet: @@CLAB_MGMT_SUBNET@@
 
 topology:
   kinds:
diff --git a/controller/test/containerlab/int01.clab.tmpl.yml b/controller/test/containerlab/int01.clab.tmpl.yml
index 10512cce11f3c85331c695cfe5c7aed1dfff67f3..89f5900f9138f646e8f7117d8c16533c84cb9667 100644
--- a/controller/test/containerlab/int01.clab.tmpl.yml
+++ b/controller/test/containerlab/int01.clab.tmpl.yml
@@ -3,7 +3,7 @@ name: @@CLAB_NAME@@
 
 mgmt:
   network: @@CLAB_NAME@@
-  ipv4_subnet: @@CLAB_MGMT_SUBNET@@
+  ipv4-subnet: @@CLAB_MGMT_SUBNET@@
 
 topology:
   kinds:
diff --git a/csbi/test.clab.yml b/csbi/test.clab.yml
index 54dc72f33533b2d0d7e5f3f9294e713c8fbd88e7..8d85447e503c8730be197d22629934a1558fb8e1 100644
--- a/csbi/test.clab.yml
+++ b/csbi/test.clab.yml
@@ -2,8 +2,8 @@ name: thesis
 
 mgmt:
   network: testbed
-  ipv4_subnet: 172.100.0.0/16       # ipv4 range
-  ipv6_subnet: 2001:db8::/64
+  ipv4-subnet: 172.100.0.0/16       # ipv4 range
+  ipv6-subnet: 2001:db8::/64
 
 topology:
   nodes:
@@ -33,4 +33,4 @@ topology:
       cmd: --csbi-orchestrator clab-thesis-orchestrator:55056
     ceos:
       kind: ceos
-      image: registry.code.fbi.h-da.de/danet/gosdn/controller/ceos
\ No newline at end of file
+      image: registry.code.fbi.h-da.de/danet/gosdn/controller/ceos
diff --git a/dev_env_data/clab/basic_two_aristas.yaml b/dev_env_data/clab/basic_two_aristas.yaml
index 36d828adce376ec571f19d5caa5b4a7920cabc7e..690e3a89ddaddaaa3d794c2d6151ca40a98842bc 100644
--- a/dev_env_data/clab/basic_two_aristas.yaml
+++ b/dev_env_data/clab/basic_two_aristas.yaml
@@ -2,8 +2,8 @@ name: gosdn_sts_demo_basic
 
 mgmt:
   network: gosdn-net
-  ipv4_subnet: 172.100.0.0/16
-  ipv6_subnet: 2001:db8::/64
+  ipv4-subnet: 172.100.0.0/16
+  ipv6-subnet: 2001:db8::/64
 
 topology:
   kinds:
diff --git a/dev_env_data/clab/demo.clab.yaml b/dev_env_data/clab/demo.clab.yaml
index 3916a01d7dc5f79922fe1c7cf6367676ea51cc84..79bd08fc50ad1421008f9191633e4a57ee1bc444 100644
--- a/dev_env_data/clab/demo.clab.yaml
+++ b/dev_env_data/clab/demo.clab.yaml
@@ -2,8 +2,8 @@ name: gosdn_sts_demo
 
 mgmt:
   network: gosdn-net
-  ipv4_subnet: 172.100.0.0/16
-  ipv6_subnet: 2001:db8::/64
+  ipv4-subnet: 172.100.0.0/16
+  ipv6-subnet: 2001:db8::/64
 
 topology:
   kinds:
diff --git a/dev_env_data/clab/gosdn.clab.yaml b/dev_env_data/clab/gosdn.clab.yaml
index 58c3f25849ca510f9c11877e3d3037cbdc24a5dc..7d2f7c33ec3160921c6f4ffbbf6190f1c7ae7590 100644
--- a/dev_env_data/clab/gosdn.clab.yaml
+++ b/dev_env_data/clab/gosdn.clab.yaml
@@ -2,8 +2,8 @@ name: gosdn_csbi_arista_base
 
 mgmt:
   network: gosdn-csbi-arista-base-net
-  ipv4_subnet: 172.100.0.0/16
-  ipv6_subnet: 2001:db8::/64
+  ipv4-subnet: 172.100.0.0/16
+  ipv6-subnet: 2001:db8::/64
 
 topology:
   kinds:
diff --git a/dev_env_data/clab/gosdn_slim.clab.yaml b/dev_env_data/clab/gosdn_slim.clab.yaml
index 6b4b63398013252d8047e532369c8082e67170b1..d31f6cd6c2bf3d2f25960818c6c0c70fb2e0c7ee 100644
--- a/dev_env_data/clab/gosdn_slim.clab.yaml
+++ b/dev_env_data/clab/gosdn_slim.clab.yaml
@@ -2,8 +2,8 @@ name: gosdn_csbi_arista_base
 
 mgmt:
   network: gosdn-csbi-arista-base-net
-  ipv4_subnet: 172.100.0.0/16
-  ipv6_subnet: 2001:db8::/64
+  ipv4-subnet: 172.100.0.0/16
+  ipv6-subnet: 2001:db8::/64
 
 topology:
   nodes: