diff --git a/classes/cluster/drivetrain_ha/bootstrap_vars b/classes/cluster/drivetrain_ha/bootstrap_vars
index 481bf83..74d82c2 100644
--- a/classes/cluster/drivetrain_ha/bootstrap_vars
+++ b/classes/cluster/drivetrain_ha/bootstrap_vars
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(glusterfs docker aptly keepalived rundeck)
+FORMULAS_SALT_MASTER+=(glusterfs docker aptly keepalived rundeck jenkins gerrit openldap devops-portal)
diff --git a/classes/cluster/drivetrain_ha/cicd/control/init.yml b/classes/cluster/drivetrain_ha/cicd/control/init.yml
index 619db7b..a8977d6 100644
--- a/classes/cluster/drivetrain_ha/cicd/control/init.yml
+++ b/classes/cluster/drivetrain_ha/cicd/control/init.yml
@@ -90,7 +90,7 @@
   # Rundeck
   - system.rundeck.client.runbook
 
- # - cluster.drivetrain_ha.cicd
+  - cluster.drivetrain_ha.cicd
  # - cluster.drivetrain_ha
 parameters:
   _param:
@@ -110,6 +110,8 @@
     cluster_public_host: ${_param:control_public_host}
     glusterfs_service_host: ${_param:control_vip_address}
 
+    admin_email: root@localhost
+
     # Haproxy SSL configuration
     cluster_ssl_certificate:
       enabled: true
diff --git a/classes/cluster/drivetrain_ha/cicd/control/master.yml b/classes/cluster/drivetrain_ha/cicd/control/master.yml
index 6d93273..4437b9e 100644
--- a/classes/cluster/drivetrain_ha/cicd/control/master.yml
+++ b/classes/cluster/drivetrain_ha/cicd/control/master.yml
@@ -43,4 +43,4 @@
   # ..projects
   - system.rundeck.client.project.cicd
   # At last
-  - cluster.drivetrain_ha.cicd.control
+  - cluster.drivetrain_ha
diff --git a/classes/cluster/drivetrain_ha/cicd/control/slave.yml b/classes/cluster/drivetrain_ha/cicd/control/slave.yml
index a3a289a..bdc7137 100644
--- a/classes/cluster/drivetrain_ha/cicd/control/slave.yml
+++ b/classes/cluster/drivetrain_ha/cicd/control/slave.yml
@@ -1,3 +1,3 @@
 classes:
-  - cluster.drivetrain_ha.cicd.control
-  - system.docker.swarm.manager
+- system.docker.swarm.manager
+- cluster.drivetrain_ha
diff --git a/classes/cluster/drivetrain_ha/infra/init.yml b/classes/cluster/drivetrain_ha/infra/init.yml
index d5e7cd7..0e2ecb7 100644
--- a/classes/cluster/drivetrain_ha/infra/init.yml
+++ b/classes/cluster/drivetrain_ha/infra/init.yml
@@ -13,11 +13,10 @@
     cluster_domain: drivetrain_ha.local
     cluster_name: drivetrain_ha
     apt_mk_version: nightly
-    admin_email: root@localhosti
-    infra_config_hostname: cfg01
+    infra_config_hostname: cid01
     infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.100
-    salt_minion_ca_host: ci01.${_param:cluster_domain}
+    salt_minion_ca_host: cid01.${_param:cluster_domain}
     salt_minion_ca_authority: salt_master_ca
   linux:
     network:
diff --git a/classes/cluster/drivetrain_ha/init.yml b/classes/cluster/drivetrain_ha/init.yml
index d80e58b..f35b844 100644
--- a/classes/cluster/drivetrain_ha/init.yml
+++ b/classes/cluster/drivetrain_ha/init.yml
@@ -1,6 +1,6 @@
 classes:
-- cluster.drivetrain_ha.infra
-- cluster.drivetrain_ha.cicd
 - cluster.drivetrain_ha.cicd.control
+- cluster.drivetrain_ha.infra
+#- cluster.drivetrain_ha.cicd
 - cluster.overrides