diff --git a/classes/cluster/drivetrain-ha-clusters/infra/init.yml b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
index 3a75d48..3ff0bcd 100644
--- a/classes/cluster/drivetrain-ha-clusters/infra/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
@@ -8,10 +8,9 @@
     infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.90
-    salt_minion_ca_host: ci01.${_param:cluster_domain}
+    salt_minion_ca_host: cid01.${_param:cluster_domain}
     salt_minion_ca_authority: salt_master_ca
     salt_master_base_environment: prd
-    salt_minion_ca_host: ${linux:network:fqdn}
     salt_master_host: ${_param:infra_config_deploy_address}
     salt_api_password: hovno12345!
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
diff --git a/classes/cluster/drivetrain-ha/infra/config.yml b/classes/cluster/drivetrain-ha/infra/config.yml
index 3fb5e9b..a360806 100644
--- a/classes/cluster/drivetrain-ha/infra/config.yml
+++ b/classes/cluster/drivetrain-ha/infra/config.yml
@@ -48,12 +48,12 @@
               value_template: <<node_deploy_ip>>
             cluster_domain:
               value_template: <<node_domain>>
-            cicd_control_node_node01_address:
+            cicd_control_node01_address:
               value_template: <<node_control_ip>>
         cicd_control_node02:
           expression: <<node_hostname>>__equals__cid02
           cluster_param:
-            cicd_control_node_node02_address:
+            cicd_control_node02_address:
               value_template: <<node_control_ip>>
         cicd_control_node03:
           expression: <<node_hostname>>__equals__cid03
diff --git a/classes/cluster/drivetrain-ha/infra/init.yml b/classes/cluster/drivetrain-ha/infra/init.yml
index 3d1efe2..d9fb296 100644
--- a/classes/cluster/drivetrain-ha/infra/init.yml
+++ b/classes/cluster/drivetrain-ha/infra/init.yml
@@ -12,7 +12,6 @@
     salt_api_password: hovno12345!
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
     salt_master_base_environment: prd
-    salt_minion_ca_host: ${linux:network:fqdn}
     salt_master_host: ${_param:infra_config_deploy_address}
     reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
     reclass_data_revision: master