diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
index 7a0cdc1..4b67eec 100644
--- a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
@@ -129,7 +129,7 @@
     # OpenLDAP
     openldap_organisation: ${_param:cluster_name}
     openldap_dn: 'dc=cicd-lab-dev,dc=local'
-    openldap_domain: ${linux:system:domain}
+    openldap_domain: 'cicd-lab-dev.local'
     openldap_admin_password: password
     openldap_config_password: password
     openldap_readonly_password: password
diff --git a/classes/cluster/drivetrain-ha/cicd/control/init.yml b/classes/cluster/drivetrain-ha/cicd/control/init.yml
index b3babec..38fce33 100644
--- a/classes/cluster/drivetrain-ha/cicd/control/init.yml
+++ b/classes/cluster/drivetrain-ha/cicd/control/init.yml
@@ -131,7 +131,7 @@
     # OpenLDAP
     openldap_organisation: ${_param:cluster_name}
     openldap_dn: 'dc=cicd-lab-dev,dc=local'
-    openldap_domain: ${linux:system:domain}
+    openldap_domain: 'cicd-lab-dev.local'
     openldap_admin_password: password
     openldap_config_password: password
     openldap_readonly_password: password
diff --git a/classes/system b/classes/system
index 0a17807..35a3304 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 0a17807f39aac95f9e0de8643f64e5116bdd1a1e
+Subproject commit 35a330487e3fa722a7ed8dc6d968c103e321eec7