diff --git a/classes/cluster/drivetrain_ha/infra/config.yml b/classes/cluster/drivetrain_ha/infra/config.yml
index a536168..3ab5749 100644
--- a/classes/cluster/drivetrain_ha/infra/config.yml
+++ b/classes/cluster/drivetrain_ha/infra/config.yml
@@ -50,7 +50,7 @@
             salt_master_host:
               value_template: <<node_master_ip>>
         infra_config:
-          expression: <<node_hostname>>__startswith__cfg
+          expression: <<node_hostname>>__equals__cid01
           cluster_param:
             infra_config_address:
               value_template: <<node_control_ip>>
@@ -58,19 +58,50 @@
               value_template: <<node_deploy_ip>>
             cluster_domain:
               value_template: <<node_domain>>
-        cicd_control01:
-          expression: <<node_hostname>>__equals__cid01
-          cluster_param:
-            cicd_control_node01_address:
+            cicd_control_node_node01_address:
               value_template: <<node_control_ip>>
-        cicd_control02:
+        cicd_control_node02:
           expression: <<node_hostname>>__equals__cid02
           cluster_param:
-            cicd_control_node02_address:
+            cicd_control_node_node02_address:
               value_template: <<node_control_ip>>
-        cicd_control03:
+        cicd_control_node03:
           expression: <<node_hostname>>__equals__cid03
           cluster_param:
             cicd_control_node03_address:
               value_template: <<node_control_ip>>
+      node:
+        cicd_control_node01:
+          name: ${_param:cicd_control_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.infra.config
+          - cluster.${_param:cluster_name}.cicd.control.master
+          params:
+            salt_master_host: 127.0.0.1
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node01_address}
+            keepalived_vip_priority: 103
+        cicd_control_node02:
+          name: ${_param:cicd_control_node02_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.cicd.control.slave
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node02_address}
+            keepalived_vip_priority: 102
+            docker_swarm_role: worker
+        cicd_control_node03:
+          name: ${_param:cicd_control_node03_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.cicd.control.slave
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node03_address}
+            keepalived_vip_priority: 101
+            docker_swarm_role: worker
 
diff --git a/classes/cluster/drivetrain_ha_clusters/cicd/init.yml b/classes/cluster/drivetrain_ha_clusters/cicd/init.yml
index b4740bf..053a652 100644
--- a/classes/cluster/drivetrain_ha_clusters/cicd/init.yml
+++ b/classes/cluster/drivetrain_ha_clusters/cicd/init.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     cicd_control_hostname: cid
-    cicd_control_address: 172.16.10.254
+    cicd_control_address: 172.16.10.252
     cicd_control_node01_hostname: cid01
     cicd_control_node01_address: 172.16.10.11
     cicd_control_node02_hostname: cid02
diff --git a/classes/cluster/drivetrain_ha_clusters/infra/config.yml b/classes/cluster/drivetrain_ha_clusters/infra/config.yml
index 4cb7db5..25e78fa 100644
--- a/classes/cluster/drivetrain_ha_clusters/infra/config.yml
+++ b/classes/cluster/drivetrain_ha_clusters/infra/config.yml
@@ -15,8 +15,6 @@
     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"
     cluster_public_host: ${_param:infra_config_address}
   salt:
     master:
@@ -56,19 +54,52 @@
               value_template: <<node_deploy_ip>>
             cluster_domain:
               value_template: <<node_domain>>
-        cicd_control01:
+        cicd_control_node01:
           expression: <<node_hostname>>__equals__cid01
           cluster_param:
             cicd_control_node01_address:
               value_template: <<node_control_ip>>
-        cicd_control02:
+        cicd_control_node02:
           expression: <<node_hostname>>__equals__cid02
           cluster_param:
             cicd_control_node02_address:
               value_template: <<node_control_ip>>
-        cicd_control03:
+        cicd_control_node03:
           expression: <<node_hostname>>__equals__cid03
           cluster_param:
             cicd_control_node03_address:
               value_template: <<node_control_ip>>
+      node:
+        cicd_control_node01:
+          name: ${_param:cicd_control_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.cicd.control.master
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node01_address}
+            keepalived_vip_priority: 103
+        cicd_control_node02:
+          name: ${_param:cicd_control_node02_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.cicd.control.slave
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node02_address}
+            keepalived_vip_priority: 102
+            docker_swarm_role: worker
+        cicd_control_node03:
+          name: ${_param:cicd_control_node03_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.cicd.control.slave
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node03_address}
+            keepalived_vip_priority: 101
+            docker_swarm_role: worker
 
diff --git a/classes/cluster/drivetrain_ha_clusters/infra/init.yml b/classes/cluster/drivetrain_ha_clusters/infra/init.yml
index 69dca1a..da06ecd 100644
--- a/classes/cluster/drivetrain_ha_clusters/infra/init.yml
+++ b/classes/cluster/drivetrain_ha_clusters/infra/init.yml
@@ -19,6 +19,8 @@
     infra_config_deploy_address: 192.168.10.100
     salt_minion_ca_host: ci01.${_param:cluster_domain}
     salt_minion_ca_authority: salt_master_ca
+    salt_api_password: hovno12345!
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
       host:
diff --git a/classes/cluster/os_ha_ovs_syndic/infra/config.yml b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
index c1251b5..72d0c50 100644
--- a/classes/cluster/os_ha_ovs_syndic/infra/config.yml
+++ b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
@@ -10,9 +10,6 @@
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
 - system.keystone.client.core
-- system.keystone.client.service.aodh
-- system.keystone.client.service.ceilometer
-- system.keystone.client.service.designate
 - system.keystone.client.service.cinder
 - system.keystone.client.service.cinder2
 - system.keystone.client.service.cinder3