diff --git a/classes/cluster/ceph_ha/infra/init.yml b/classes/cluster/ceph_ha/infra/init.yml
index 01a74ea..d3ecd1f 100644
--- a/classes/cluster/ceph_ha/infra/init.yml
+++ b/classes/cluster/ceph_ha/infra/init.yml
@@ -16,7 +16,7 @@
 #    infra_config_address: 172.16.10.100
 #    infra_config_deploy_address: 192.168.10.100
 
-    cluster_domain: ceph_ha.local
+    cluster_domain: ceph-ha.local
     cluster_name: ceph_ha
     apt_mk_version: nightly
     primary_interface: ens3
diff --git a/classes/cluster/drivetrain_ha/infra/init.yml b/classes/cluster/drivetrain_ha/infra/init.yml
index 0e2ecb7..31e590a 100644
--- a/classes/cluster/drivetrain_ha/infra/init.yml
+++ b/classes/cluster/drivetrain_ha/infra/init.yml
@@ -10,7 +10,7 @@
 - system.openssh.server.team.oss_team
 parameters:
   _param:
-    cluster_domain: drivetrain_ha.local
+    cluster_domain: drivetrain-ha.local
     cluster_name: drivetrain_ha
     apt_mk_version: nightly
     infra_config_hostname: cid01
diff --git a/classes/cluster/drivetrain_ha_clusters/infra/init.yml b/classes/cluster/drivetrain_ha_clusters/infra/init.yml
index da06ecd..3f5db90 100644
--- a/classes/cluster/drivetrain_ha_clusters/infra/init.yml
+++ b/classes/cluster/drivetrain_ha_clusters/infra/init.yml
@@ -10,7 +10,7 @@
 - system.openssh.server.team.oss_team
 parameters:
   _param:
-    cluster_domain: drivetrain_ha_clusters.local
+    cluster_domain: drivetrain-ha-clusters.local
     cluster_name: drivetrain_ha_clusters
     apt_mk_version: nightly
     admin_email: root@localhosti
diff --git a/classes/cluster/k8s_aio_contrail/infra/init.yml b/classes/cluster/k8s_aio_contrail/infra/init.yml
index 199beba..8fccc4f 100644
--- a/classes/cluster/k8s_aio_contrail/infra/init.yml
+++ b/classes/cluster/k8s_aio_contrail/infra/init.yml
@@ -15,7 +15,7 @@
     infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.100
 
-    cluster_domain: k8s_aio_contrail.local
+    cluster_domain: k8s-aio-contrail.local
     cluster_name: k8s_aio_contrail
     apt_mk_version: nightly
   linux:
diff --git a/classes/cluster/k8s_ha_contrail/infra/init.yml b/classes/cluster/k8s_ha_contrail/infra/init.yml
index a624371..fad2edc 100644
--- a/classes/cluster/k8s_ha_contrail/infra/init.yml
+++ b/classes/cluster/k8s_ha_contrail/infra/init.yml
@@ -9,7 +9,7 @@
     infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.100
 
-    cluster_domain: k8s_ha_contrail.local
+    cluster_domain: k8s-ha-contrail.local
     cluster_name: k8s_ha_contrail
     apt_mk_version: nightly
   linux:
diff --git a/classes/cluster/model_manager/infra/init.yml b/classes/cluster/model_manager/infra/init.yml
index bda166a..4478e59 100644
--- a/classes/cluster/model_manager/infra/init.yml
+++ b/classes/cluster/model_manager/infra/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    cluster_domain: model_manager.local
+    cluster_domain: model-manager.local
     cluster_name: model_manager
     infra_config_deploy_address: 192.168.10.100
     infra_config_address: 172.16.10.100
diff --git a/classes/cluster/os_aio_contrail/infra/init.yml b/classes/cluster/os_aio_contrail/infra/init.yml
index 81b8485..0900cb4 100755
--- a/classes/cluster/os_aio_contrail/infra/init.yml
+++ b/classes/cluster/os_aio_contrail/infra/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    cluster_domain: os_aio_contrail.local
+    cluster_domain: os-aio-contrail.local
     cluster_name: os_aio_contrail
     infra_config_deploy_address: 192.168.10.90
     infra_config_address: 172.16.10.90
diff --git a/classes/cluster/os_aio_ovs/infra/init.yml b/classes/cluster/os_aio_ovs/infra/init.yml
index fee7829..03846c3 100644
--- a/classes/cluster/os_aio_ovs/infra/init.yml
+++ b/classes/cluster/os_aio_ovs/infra/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    cluster_domain: os_aio_ovs.local
+    cluster_domain: os-aio-ovs.local
     cluster_name: os_aio_ovs
     infra_config_deploy_address: 192.168.10.90
     infra_config_address: 172.16.10.90
diff --git a/classes/cluster/os_ha_contrail/infra/init.yml b/classes/cluster/os_ha_contrail/infra/init.yml
index b80fa88..620e669 100755
--- a/classes/cluster/os_ha_contrail/infra/init.yml
+++ b/classes/cluster/os_ha_contrail/infra/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    cluster_domain: os_ha_contrail.local
+    cluster_domain: os-ha-contrail.local
     cluster_name: os_ha_contrail
     infra_config_deploy_address: 192.168.10.100
     infra_config_address: 172.16.10.100
diff --git a/classes/cluster/os_ha_ovs/infra/init.yml b/classes/cluster/os_ha_ovs/infra/init.yml
index d5b51f9..b035577 100644
--- a/classes/cluster/os_ha_ovs/infra/init.yml
+++ b/classes/cluster/os_ha_ovs/infra/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    cluster_domain: os_ha_ovs.local
+    cluster_domain: os-ha-ovs.local
     cluster_name: os_ha_ovs
     infra_config_deploy_address: 192.168.10.90
     infra_config_address: 172.16.10.90
diff --git a/classes/cluster/os_ha_ovs_syndic/infra/init.yml b/classes/cluster/os_ha_ovs_syndic/infra/init.yml
index c6de909..90af472 100644
--- a/classes/cluster/os_ha_ovs_syndic/infra/init.yml
+++ b/classes/cluster/os_ha_ovs_syndic/infra/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    cluster_domain: os_ha_ovs_syndic.local
+    cluster_domain: os-ha-ovs-syndic.local
     cluster_name: os_ha_ovs_syndic
     infra_config_deploy_address: 192.168.10.90
     infra_config_address: 172.16.10.90
diff --git a/classes/cluster/sl_k8s_contrail/infra/init.yml b/classes/cluster/sl_k8s_contrail/infra/init.yml
index d5b43d9..cb7e820 100644
--- a/classes/cluster/sl_k8s_contrail/infra/init.yml
+++ b/classes/cluster/sl_k8s_contrail/infra/init.yml
@@ -10,7 +10,7 @@
     infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.100
 
-    cluster_domain: sl_k8s_contrail.local
+    cluster_domain: sl-k8s-contrail.local
     cluster_name: sl_k8s_contrail
     apt_mk_version: nightly
   linux:
diff --git a/classes/cluster/sl_os_contrail/infra/init.yml b/classes/cluster/sl_os_contrail/infra/init.yml
index 38ef139..893c1d4 100755
--- a/classes/cluster/sl_os_contrail/infra/init.yml
+++ b/classes/cluster/sl_os_contrail/infra/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    cluster_domain: sl_os_contrail.local
+    cluster_domain: sl-os-contrail.local
     cluster_name: sl_os_contrail
     infra_config_deploy_address: 192.168.10.100
     infra_config_address: 172.16.10.100
diff --git a/classes/cluster/sl_os_ovs/infra/init.yml b/classes/cluster/sl_os_ovs/infra/init.yml
index 9acca1d..c2dc133 100644
--- a/classes/cluster/sl_os_ovs/infra/init.yml
+++ b/classes/cluster/sl_os_ovs/infra/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    cluster_domain: sl_os_ovs.local
+    cluster_domain: sl-os-ovs.local
     cluster_name: sl_os_ovs
     infra_config_deploy_address: 192.168.10.100
     infra_config_address: 172.16.10.100