diff --git a/classes/cluster/drivetrain-ha-clusters/infra/config.yml b/classes/cluster/drivetrain-ha-clusters/infra/config.yml
index 378bcb9..7dec9ef 100644
--- a/classes/cluster/drivetrain-ha-clusters/infra/config.yml
+++ b/classes/cluster/drivetrain-ha-clusters/infra/config.yml
@@ -72,6 +72,7 @@
             linux_system_codename: xenial
             single_address: ${_param:cicd_control_node01_address}
             keepalived_vip_priority: 103
+            glusterfs_node_role: primary
         cicd_control_node02:
           name: ${_param:cicd_control_node02_hostname}
           domain: ${_param:cluster_domain}
@@ -83,6 +84,7 @@
             single_address: ${_param:cicd_control_node02_address}
             keepalived_vip_priority: 102
             docker_swarm_role: worker
+            glusterfs_node_role: secondary
         cicd_control_node03:
           name: ${_param:cicd_control_node03_hostname}
           domain: ${_param:cluster_domain}
@@ -94,3 +96,4 @@
             single_address: ${_param:cicd_control_node03_address}
             keepalived_vip_priority: 101
             docker_swarm_role: worker
+            glusterfs_node_role: secondary
diff --git a/classes/cluster/drivetrain-ha-oss/cicd/control/leader.yml b/classes/cluster/drivetrain-ha-oss/cicd/control/leader.yml
index 9771de0..4e1058a 100644
--- a/classes/cluster/drivetrain-ha-oss/cicd/control/leader.yml
+++ b/classes/cluster/drivetrain-ha-oss/cicd/control/leader.yml
@@ -35,7 +35,7 @@
   # OpenLDAP
   - system.openldap.client
   - system.openldap.client.people.admin
-
+  - cluster.drivetrain-ha-oss.cicd.control
   - cluster.drivetrain-ha-oss
 
 parameters:
diff --git a/classes/cluster/drivetrain-ha-oss/cicd/control/manager.yml b/classes/cluster/drivetrain-ha-oss/cicd/control/manager.yml
index 10aad44..38b51bd 100644
--- a/classes/cluster/drivetrain-ha-oss/cicd/control/manager.yml
+++ b/classes/cluster/drivetrain-ha-oss/cicd/control/manager.yml
@@ -1,3 +1,4 @@
 classes:
   - system.docker.swarm.manager
+  - cluster.drivetrain-ha-oss.cicd.control
   - cluster.drivetrain-ha-oss
diff --git a/classes/cluster/drivetrain-ha-oss/infra/config.yml b/classes/cluster/drivetrain-ha-oss/infra/config.yml
index ffc49cd..9a97d44 100644
--- a/classes/cluster/drivetrain-ha-oss/infra/config.yml
+++ b/classes/cluster/drivetrain-ha-oss/infra/config.yml
@@ -74,6 +74,7 @@
             linux_system_codename: xenial
             single_address: ${_param:cicd_control_node01_address}
             keepalived_vip_priority: 103
+            glusterfs_node_role: primary
         cicd_control_node02:
           name: ${_param:cicd_control_node02_hostname}
           domain: ${_param:cluster_domain}
@@ -86,6 +87,7 @@
             single_address: ${_param:cicd_control_node02_address}
             keepalived_vip_priority: 102
             docker_swarm_role: worker
+            glusterfs_node_role: secondary
         cicd_control_node03:
           name: ${_param:cicd_control_node03_hostname}
           domain: ${_param:cluster_domain}
@@ -98,4 +100,5 @@
             single_address: ${_param:cicd_control_node03_address}
             keepalived_vip_priority: 101
             docker_swarm_role: worker
+            glusterfs_node_role: secondary
 
diff --git a/classes/cluster/drivetrain-ha-oss/init.yml b/classes/cluster/drivetrain-ha-oss/init.yml
index bcd025b..f17aca8 100644
--- a/classes/cluster/drivetrain-ha-oss/init.yml
+++ b/classes/cluster/drivetrain-ha-oss/init.yml
@@ -6,5 +6,5 @@
   - system.linux.system.motd.dynamic
   - system.openssh.server.team.all
   - cluster.drivetrain-ha-oss.infra
-  - cluster.drivetrain-ha-oss.cicd.control
+  - cluster.drivetrain-ha-oss.cicd
   - cluster.overrides
diff --git a/classes/cluster/drivetrain-ha/infra/config.yml b/classes/cluster/drivetrain-ha/infra/config.yml
index 96c4963..8c95485 100644
--- a/classes/cluster/drivetrain-ha/infra/config.yml
+++ b/classes/cluster/drivetrain-ha/infra/config.yml
@@ -73,6 +73,7 @@
             linux_system_codename: xenial
             single_address: ${_param:cicd_control_node01_address}
             keepalived_vip_priority: 103
+            glusterfs_node_role: primary
         cicd_control_node02:
           name: ${_param:cicd_control_node02_hostname}
           domain: ${_param:cluster_domain}
@@ -84,6 +85,7 @@
             single_address: ${_param:cicd_control_node02_address}
             keepalived_vip_priority: 102
             docker_swarm_role: worker
+            glusterfs_node_role: secondary
         cicd_control_node03:
           name: ${_param:cicd_control_node03_hostname}
           domain: ${_param:cluster_domain}
@@ -95,4 +97,5 @@
             single_address: ${_param:cicd_control_node03_address}
             keepalived_vip_priority: 101
             docker_swarm_role: worker
+            glusterfs_node_role: secondary